From f684aa4b2d123de6ffb280d6801a683921307596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Kijewski?= Date: Thu, 27 Nov 2014 22:30:14 +0100 Subject: [PATCH] tests: make embUnit a normal sys module There is nothing quite special about embUnit. This PR makes it a normal sys module, so that you can use it in any application / test. --- Makefile.application | 7 ---- sys/Makefile.include | 10 ++++++ {tests/unittests => sys}/embunit/AUTHORS | 0 .../embUnit => sys/embunit}/AssertImpl.c | 2 +- {tests/unittests => sys}/embunit/COPYING | 0 .../embunit}/CompilerOutputter.c | 0 .../embunit/embUnit => sys/embunit}/Makefile | 2 +- .../embUnit => sys/embunit}/RepeatedTest.c | 0 .../embUnit => sys/embunit}/TestCaller.c | 0 .../embUnit => sys/embunit}/TestCase.c | 0 .../embUnit => sys/embunit}/TestResult.c | 0 .../embUnit => sys/embunit}/TestRunner.c | 2 +- .../embUnit => sys/embunit}/TestSuite.c | 0 .../textui => sys/embunit}/TextOutputter.c | 0 .../textui => sys/embunit}/TextUIRunner.c | 0 .../textui => sys/embunit}/XMLOutputter.c | 0 .../unittests => sys}/embunit/readme_en.txt | 0 .../embunit/embUnit => sys/embunit}/stdImpl.c | 0 .../unittests.h => sys/include/embUnit.h | 33 +++++++++++-------- .../include}/embUnit/AssertImpl.h | 0 .../include/embUnit}/CompilerOutputter.h | 0 .../include}/embUnit/HelperMacro.h | 0 .../include/embUnit}/Outputter.h | 0 .../include}/embUnit/RepeatedTest.h | 0 .../embunit => sys/include}/embUnit/Test.h | 0 .../include}/embUnit/TestCaller.h | 0 .../include}/embUnit/TestCase.h | 0 .../include}/embUnit/TestListener.h | 0 .../include}/embUnit/TestResult.h | 0 .../include}/embUnit/TestRunner.h | 0 .../include}/embUnit/TestSuite.h | 0 .../include/embUnit}/TextOutputter.h | 0 .../include/embUnit}/TextUIRunner.h | 0 .../include/embUnit}/XMLOutputter.h | 0 .../embunit => sys/include}/embUnit/embUnit.h | 0 .../include/embUnit/embUnit_config.h | 0 .../embunit => sys/include}/embUnit/stdImpl.h | 0 tests/unittests/Makefile | 13 -------- tests/unittests/embunit/textui/Makefile | 5 --- tests/unittests/main.c | 2 +- tests/unittests/tests-bloom/tests-bloom.h | 2 +- tests/unittests/tests-cbor/tests-cbor.c | 2 +- .../unittests/tests-core/tests-core-atomic.c | 2 +- .../tests-core/tests-core-bitarithm.c | 2 +- .../tests-core/tests-core-byteorder.c | 2 +- tests/unittests/tests-core/tests-core-cib.c | 2 +- tests/unittests/tests-core/tests-core-clist.c | 2 +- tests/unittests/tests-core/tests-core-lifo.c | 2 +- .../tests-core/tests-core-priority-queue.c | 2 +- tests/unittests/tests-core/tests-core.h | 2 +- tests/unittests/tests-crypto/tests-crypto.h | 2 +- .../tests-netdev_dummy/tests-netdev_dummy.c | 2 +- .../tests-netdev_dummy/tests-netdev_dummy.h | 2 +- tests/unittests/tests-pktbuf/tests-pktbuf.c | 2 +- tests/unittests/tests-pktbuf/tests-pktbuf.h | 2 +- .../unittests/tests-pktqueue/tests-pktqueue.c | 2 +- .../unittests/tests-pktqueue/tests-pktqueue.h | 3 +- tests/unittests/tests-timex/tests-timex.h | 2 +- .../tests-ubjson/test-ubjson-empty-array.c | 1 + .../tests-ubjson/test-ubjson-empty-object.c | 1 + tests/unittests/tests-ubjson/tests-ubjson.c | 2 ++ tests/unittests/tests-ubjson/tests-ubjson.h | 6 +--- 62 files changed, 56 insertions(+), 67 deletions(-) rename {tests/unittests => sys}/embunit/AUTHORS (100%) rename {tests/unittests/embunit/embUnit => sys/embunit}/AssertImpl.c (99%) rename {tests/unittests => sys}/embunit/COPYING (100%) rename {tests/unittests/embunit/textui => sys/embunit}/CompilerOutputter.c (100%) rename {tests/unittests/embunit/embUnit => sys/embunit}/Makefile (51%) rename {tests/unittests/embunit/embUnit => sys/embunit}/RepeatedTest.c (100%) rename {tests/unittests/embunit/embUnit => sys/embunit}/TestCaller.c (100%) rename {tests/unittests/embunit/embUnit => sys/embunit}/TestCase.c (100%) rename {tests/unittests/embunit/embUnit => sys/embunit}/TestResult.c (100%) rename {tests/unittests/embunit/embUnit => sys/embunit}/TestRunner.c (99%) rename {tests/unittests/embunit/embUnit => sys/embunit}/TestSuite.c (100%) rename {tests/unittests/embunit/textui => sys/embunit}/TextOutputter.c (100%) rename {tests/unittests/embunit/textui => sys/embunit}/TextUIRunner.c (100%) rename {tests/unittests/embunit/textui => sys/embunit}/XMLOutputter.c (100%) rename {tests/unittests => sys}/embunit/readme_en.txt (100%) rename {tests/unittests/embunit/embUnit => sys/embunit}/stdImpl.c (100%) rename tests/unittests/unittests.h => sys/include/embUnit.h (72%) rename {tests/unittests/embunit => sys/include}/embUnit/AssertImpl.h (100%) rename {tests/unittests/embunit/textui => sys/include/embUnit}/CompilerOutputter.h (100%) rename {tests/unittests/embunit => sys/include}/embUnit/HelperMacro.h (100%) rename {tests/unittests/embunit/textui => sys/include/embUnit}/Outputter.h (100%) rename {tests/unittests/embunit => sys/include}/embUnit/RepeatedTest.h (100%) rename {tests/unittests/embunit => sys/include}/embUnit/Test.h (100%) rename {tests/unittests/embunit => sys/include}/embUnit/TestCaller.h (100%) rename {tests/unittests/embunit => sys/include}/embUnit/TestCase.h (100%) rename {tests/unittests/embunit => sys/include}/embUnit/TestListener.h (100%) rename {tests/unittests/embunit => sys/include}/embUnit/TestResult.h (100%) rename {tests/unittests/embunit => sys/include}/embUnit/TestRunner.h (100%) rename {tests/unittests/embunit => sys/include}/embUnit/TestSuite.h (100%) rename {tests/unittests/embunit/textui => sys/include/embUnit}/TextOutputter.h (100%) rename {tests/unittests/embunit/textui => sys/include/embUnit}/TextUIRunner.h (100%) rename {tests/unittests/embunit/textui => sys/include/embUnit}/XMLOutputter.h (100%) rename {tests/unittests/embunit => sys/include}/embUnit/embUnit.h (100%) rename tests/unittests/embunit/embUnit/config.h => sys/include/embUnit/embUnit_config.h (100%) rename {tests/unittests/embunit => sys/include}/embUnit/stdImpl.h (100%) delete mode 100644 tests/unittests/embunit/textui/Makefile diff --git a/Makefile.application b/Makefile.application index 5f1e1ae589..36450d1e1d 100644 --- a/Makefile.application +++ b/Makefile.application @@ -3,11 +3,4 @@ MODULE = $(APPLICATION) DIRS += $(RIOTCPU)/$(CPU) $(RIOTBOARD)/$(BOARD) DIRS += $(RIOTBASE)/core $(RIOTBASE)/drivers $(RIOTBASE)/sys -ifneq (,$(filter embunit,$(USEMODULE))) - DIRS += $(RIOTBASE)/tests/unittests/embunit/embUnit -endif -ifneq (,$(filter embunit_textui,$(USEMODULE))) - DIRS += $(RIOTBASE)/tests/unittests/embunit/textui -endif - include $(RIOTBASE)/Makefile.base diff --git a/sys/Makefile.include b/sys/Makefile.include index e974bb582d..fa45959152 100644 --- a/sys/Makefile.include +++ b/sys/Makefile.include @@ -69,3 +69,13 @@ endif ifneq (,$(filter oneway_malloc,$(USEMODULE))) USEMODULE_INCLUDES += $(RIOTBASE)/sys/oneway-malloc/include endif + +ifneq (,$(filter embunit,$(USEMODULE))) + ifeq ($(OUTPUT),XML) + CFLAGS += -DOUTPUT=OUTPUT_XML + else ifeq ($(OUTPUT),TEXT) + CFLAGS += -DOUTPUT=OUTPUT_TEXT + else ifeq ($(OUTPUT),COMPILER) + CFLAGS += -DOUTPUT=OUTPUT_COMPILER + endif +endif diff --git a/tests/unittests/embunit/AUTHORS b/sys/embunit/AUTHORS similarity index 100% rename from tests/unittests/embunit/AUTHORS rename to sys/embunit/AUTHORS diff --git a/tests/unittests/embunit/embUnit/AssertImpl.c b/sys/embunit/AssertImpl.c similarity index 99% rename from tests/unittests/embunit/embUnit/AssertImpl.c rename to sys/embunit/AssertImpl.c index 24dcf010b9..272b4193f5 100644 --- a/tests/unittests/embunit/embUnit/AssertImpl.c +++ b/sys/embunit/AssertImpl.c @@ -32,7 +32,7 @@ * * $Id: AssertImpl.c,v 1.5 2004/02/10 16:15:25 arms22 Exp $ */ -#include "config.h" +#include "embUnit_config.h" #include "stdImpl.h" #include "AssertImpl.h" diff --git a/tests/unittests/embunit/COPYING b/sys/embunit/COPYING similarity index 100% rename from tests/unittests/embunit/COPYING rename to sys/embunit/COPYING diff --git a/tests/unittests/embunit/textui/CompilerOutputter.c b/sys/embunit/CompilerOutputter.c similarity index 100% rename from tests/unittests/embunit/textui/CompilerOutputter.c rename to sys/embunit/CompilerOutputter.c diff --git a/tests/unittests/embunit/embUnit/Makefile b/sys/embunit/Makefile similarity index 51% rename from tests/unittests/embunit/embUnit/Makefile rename to sys/embunit/Makefile index 981297ba89..8f5b3d80ab 100644 --- a/tests/unittests/embunit/embUnit/Makefile +++ b/sys/embunit/Makefile @@ -1,5 +1,5 @@ MODULE = embunit -INCLUDES += -I$(RIOTBASE)/tests/unittests/embunit +INCLUDES += -I$(RIOTBASE)/sys/include/embUnit include $(RIOTBASE)/Makefile.base diff --git a/tests/unittests/embunit/embUnit/RepeatedTest.c b/sys/embunit/RepeatedTest.c similarity index 100% rename from tests/unittests/embunit/embUnit/RepeatedTest.c rename to sys/embunit/RepeatedTest.c diff --git a/tests/unittests/embunit/embUnit/TestCaller.c b/sys/embunit/TestCaller.c similarity index 100% rename from tests/unittests/embunit/embUnit/TestCaller.c rename to sys/embunit/TestCaller.c diff --git a/tests/unittests/embunit/embUnit/TestCase.c b/sys/embunit/TestCase.c similarity index 100% rename from tests/unittests/embunit/embUnit/TestCase.c rename to sys/embunit/TestCase.c diff --git a/tests/unittests/embunit/embUnit/TestResult.c b/sys/embunit/TestResult.c similarity index 100% rename from tests/unittests/embunit/embUnit/TestResult.c rename to sys/embunit/TestResult.c diff --git a/tests/unittests/embunit/embUnit/TestRunner.c b/sys/embunit/TestRunner.c similarity index 99% rename from tests/unittests/embunit/embUnit/TestRunner.c rename to sys/embunit/TestRunner.c index 22b0c0fb5c..d19f8e936c 100644 --- a/tests/unittests/embunit/embUnit/TestRunner.c +++ b/sys/embunit/TestRunner.c @@ -32,7 +32,7 @@ * * $Id: TestRunner.c,v 1.6 2004/02/10 16:19:29 arms22 Exp $ */ -#include "config.h" +#include "embUnit_config.h" #include "stdImpl.h" #include "Test.h" #include "TestListener.h" diff --git a/tests/unittests/embunit/embUnit/TestSuite.c b/sys/embunit/TestSuite.c similarity index 100% rename from tests/unittests/embunit/embUnit/TestSuite.c rename to sys/embunit/TestSuite.c diff --git a/tests/unittests/embunit/textui/TextOutputter.c b/sys/embunit/TextOutputter.c similarity index 100% rename from tests/unittests/embunit/textui/TextOutputter.c rename to sys/embunit/TextOutputter.c diff --git a/tests/unittests/embunit/textui/TextUIRunner.c b/sys/embunit/TextUIRunner.c similarity index 100% rename from tests/unittests/embunit/textui/TextUIRunner.c rename to sys/embunit/TextUIRunner.c diff --git a/tests/unittests/embunit/textui/XMLOutputter.c b/sys/embunit/XMLOutputter.c similarity index 100% rename from tests/unittests/embunit/textui/XMLOutputter.c rename to sys/embunit/XMLOutputter.c diff --git a/tests/unittests/embunit/readme_en.txt b/sys/embunit/readme_en.txt similarity index 100% rename from tests/unittests/embunit/readme_en.txt rename to sys/embunit/readme_en.txt diff --git a/tests/unittests/embunit/embUnit/stdImpl.c b/sys/embunit/stdImpl.c similarity index 100% rename from tests/unittests/embunit/embUnit/stdImpl.c rename to sys/embunit/stdImpl.c diff --git a/tests/unittests/unittests.h b/sys/include/embUnit.h similarity index 72% rename from tests/unittests/unittests.h rename to sys/include/embUnit.h index f88e90e612..d4a2332f1b 100644 --- a/tests/unittests/unittests.h +++ b/sys/include/embUnit.h @@ -7,21 +7,18 @@ */ /** - * @addtogroup unittests + * @addtogroup unittests + * @addtogroup sys * @{ * - * @file unittests.h - * @brief Common header file for unittests + * @file + * @brief Common header file for unittests * - * @author Martine Lenders + * @author Martine Lenders */ -#ifndef __UNITTESTS__H -#define __UNITTESTS__H - -#ifdef __cplusplus -extern "C" { -#endif +#ifndef __SYS__EMB_UNIT__H +#define __SYS__EMB_UNIT__H #include "embUnit/embUnit.h" @@ -31,17 +28,17 @@ extern "C" { # define OUTPUT_COMPILER (4) # if (OUTPUT==OUTPUT_XML) -# include "textui/XMLOutputter.h" +# include "embUnit/XMLOutputter.h" # define OUTPUTTER (XMLOutputter_outputter()) # elif (OUTPUT==OUTPUT_TEXT) -# include "textui/TextOutputter.h" +# include "embUnit/TextOutputter.h" # define OUTPUTTER (TextOutputter_outputter()) # elif (OUTPUT==OUTPUT_COMPILER) -# include "textui/CompilerOutputter.h" +# include "embUnit/CompilerOutputter.h" # define OUTPUTTER (CompilerOutputter_outputter()) # endif -# include "textui/TextUIRunner.h" +# include "embUnit/TextUIRunner.h" # define TESTS_START() TextUIRunner_start() # define TESTS_RUN(t) TextUIRunner_runTest(t) @@ -52,8 +49,16 @@ extern "C" { # define TESTS_END() TestRunner_end() #endif +#ifdef __cplusplus +extern "C" { +#endif + #ifdef __cplusplus } #endif #endif + +/** + * @} + */ diff --git a/tests/unittests/embunit/embUnit/AssertImpl.h b/sys/include/embUnit/AssertImpl.h similarity index 100% rename from tests/unittests/embunit/embUnit/AssertImpl.h rename to sys/include/embUnit/AssertImpl.h diff --git a/tests/unittests/embunit/textui/CompilerOutputter.h b/sys/include/embUnit/CompilerOutputter.h similarity index 100% rename from tests/unittests/embunit/textui/CompilerOutputter.h rename to sys/include/embUnit/CompilerOutputter.h diff --git a/tests/unittests/embunit/embUnit/HelperMacro.h b/sys/include/embUnit/HelperMacro.h similarity index 100% rename from tests/unittests/embunit/embUnit/HelperMacro.h rename to sys/include/embUnit/HelperMacro.h diff --git a/tests/unittests/embunit/textui/Outputter.h b/sys/include/embUnit/Outputter.h similarity index 100% rename from tests/unittests/embunit/textui/Outputter.h rename to sys/include/embUnit/Outputter.h diff --git a/tests/unittests/embunit/embUnit/RepeatedTest.h b/sys/include/embUnit/RepeatedTest.h similarity index 100% rename from tests/unittests/embunit/embUnit/RepeatedTest.h rename to sys/include/embUnit/RepeatedTest.h diff --git a/tests/unittests/embunit/embUnit/Test.h b/sys/include/embUnit/Test.h similarity index 100% rename from tests/unittests/embunit/embUnit/Test.h rename to sys/include/embUnit/Test.h diff --git a/tests/unittests/embunit/embUnit/TestCaller.h b/sys/include/embUnit/TestCaller.h similarity index 100% rename from tests/unittests/embunit/embUnit/TestCaller.h rename to sys/include/embUnit/TestCaller.h diff --git a/tests/unittests/embunit/embUnit/TestCase.h b/sys/include/embUnit/TestCase.h similarity index 100% rename from tests/unittests/embunit/embUnit/TestCase.h rename to sys/include/embUnit/TestCase.h diff --git a/tests/unittests/embunit/embUnit/TestListener.h b/sys/include/embUnit/TestListener.h similarity index 100% rename from tests/unittests/embunit/embUnit/TestListener.h rename to sys/include/embUnit/TestListener.h diff --git a/tests/unittests/embunit/embUnit/TestResult.h b/sys/include/embUnit/TestResult.h similarity index 100% rename from tests/unittests/embunit/embUnit/TestResult.h rename to sys/include/embUnit/TestResult.h diff --git a/tests/unittests/embunit/embUnit/TestRunner.h b/sys/include/embUnit/TestRunner.h similarity index 100% rename from tests/unittests/embunit/embUnit/TestRunner.h rename to sys/include/embUnit/TestRunner.h diff --git a/tests/unittests/embunit/embUnit/TestSuite.h b/sys/include/embUnit/TestSuite.h similarity index 100% rename from tests/unittests/embunit/embUnit/TestSuite.h rename to sys/include/embUnit/TestSuite.h diff --git a/tests/unittests/embunit/textui/TextOutputter.h b/sys/include/embUnit/TextOutputter.h similarity index 100% rename from tests/unittests/embunit/textui/TextOutputter.h rename to sys/include/embUnit/TextOutputter.h diff --git a/tests/unittests/embunit/textui/TextUIRunner.h b/sys/include/embUnit/TextUIRunner.h similarity index 100% rename from tests/unittests/embunit/textui/TextUIRunner.h rename to sys/include/embUnit/TextUIRunner.h diff --git a/tests/unittests/embunit/textui/XMLOutputter.h b/sys/include/embUnit/XMLOutputter.h similarity index 100% rename from tests/unittests/embunit/textui/XMLOutputter.h rename to sys/include/embUnit/XMLOutputter.h diff --git a/tests/unittests/embunit/embUnit/embUnit.h b/sys/include/embUnit/embUnit.h similarity index 100% rename from tests/unittests/embunit/embUnit/embUnit.h rename to sys/include/embUnit/embUnit.h diff --git a/tests/unittests/embunit/embUnit/config.h b/sys/include/embUnit/embUnit_config.h similarity index 100% rename from tests/unittests/embunit/embUnit/config.h rename to sys/include/embUnit/embUnit_config.h diff --git a/tests/unittests/embunit/embUnit/stdImpl.h b/sys/include/embUnit/stdImpl.h similarity index 100% rename from tests/unittests/embunit/embUnit/stdImpl.h rename to sys/include/embUnit/stdImpl.h diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile index 1b7c6636a3..de88613e60 100644 --- a/tests/unittests/Makefile +++ b/tests/unittests/Makefile @@ -6,19 +6,6 @@ BOARD_INSUFFICIENT_RAM := chronos msb-430 msb-430h redbee-econotag stm32f0discov USEMODULE += embunit -INCLUDES += -I$(RIOTBASE)/tests/unittests/embunit - -ifeq ($(OUTPUT),XML) - CFLAGS += -DOUTPUT=OUTPUT_XML - USEMODULE += embunit_textui -else ifeq ($(OUTPUT),TEXT) - CFLAGS += -DOUTPUT=OUTPUT_TEXT - USEMODULE += embunit_textui -else ifeq ($(OUTPUT),COMPILER) - CFLAGS += -DOUTPUT=OUTPUT_COMPILER - USEMODULE += embunit_textui -endif - # Some randomly generated but still deterministic values for testing CFLAGS += -DTEST_STRING8="\"o<\\\\rrB/q\"" CFLAGS += -DTEST_STRING12="\"50U'HLKC3_ft\"" diff --git a/tests/unittests/embunit/textui/Makefile b/tests/unittests/embunit/textui/Makefile deleted file mode 100644 index 5f5c5983eb..0000000000 --- a/tests/unittests/embunit/textui/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -MODULE = embunit_textui - -INCLUDES += -I$(RIOTBASE)/tests/unittests/embunit - -include $(RIOTBASE)/Makefile.base diff --git a/tests/unittests/main.c b/tests/unittests/main.c index 8ec2742402..2d4ba2ea8f 100644 --- a/tests/unittests/main.c +++ b/tests/unittests/main.c @@ -6,9 +6,9 @@ * directory for more details. */ -#include "unittests.h" #include "map.h" +#include "embUnit.h" #include "lpm.h" #define UNCURRY(FUN, ARGS) FUN(ARGS) diff --git a/tests/unittests/tests-bloom/tests-bloom.h b/tests/unittests/tests-bloom/tests-bloom.h index 38bd3478c0..1c711190b8 100644 --- a/tests/unittests/tests-bloom/tests-bloom.h +++ b/tests/unittests/tests-bloom/tests-bloom.h @@ -18,7 +18,7 @@ #ifndef __TESTS_BLOOM_H_ #define __TESTS_BLOOM_H_ -#include "../unittests.h" +#include "embUnit.h" #ifdef __cplusplus extern "C" { diff --git a/tests/unittests/tests-cbor/tests-cbor.c b/tests/unittests/tests-cbor/tests-cbor.c index e6ecbfd5f5..a66fa89c75 100644 --- a/tests/unittests/tests-cbor/tests-cbor.c +++ b/tests/unittests/tests-cbor/tests-cbor.c @@ -13,7 +13,7 @@ * @author Jana Cavojska */ -#include "../unittests.h" +#include "embUnit.h" #include "bitarithm.h" #include "cbor.h" diff --git a/tests/unittests/tests-core/tests-core-atomic.c b/tests/unittests/tests-core/tests-core-atomic.c index f66714b557..888f7a351d 100644 --- a/tests/unittests/tests-core/tests-core-atomic.c +++ b/tests/unittests/tests-core/tests-core-atomic.c @@ -8,7 +8,7 @@ #include -#include "embUnit/embUnit.h" +#include "embUnit.h" #include "atomic.h" diff --git a/tests/unittests/tests-core/tests-core-bitarithm.c b/tests/unittests/tests-core/tests-core-bitarithm.c index a8cc7f2e0d..31196d7c2c 100644 --- a/tests/unittests/tests-core/tests-core-bitarithm.c +++ b/tests/unittests/tests-core/tests-core-bitarithm.c @@ -9,7 +9,7 @@ #include #include -#include "embUnit/embUnit.h" +#include "embUnit.h" #include "bitarithm.h" diff --git a/tests/unittests/tests-core/tests-core-byteorder.c b/tests/unittests/tests-core/tests-core-byteorder.c index 3dc940eddf..9f5ecb6a95 100644 --- a/tests/unittests/tests-core/tests-core-byteorder.c +++ b/tests/unittests/tests-core/tests-core-byteorder.c @@ -6,7 +6,7 @@ * directory for more details. */ -#include "embUnit/embUnit.h" +#include "embUnit.h" #include "byteorder.h" diff --git a/tests/unittests/tests-core/tests-core-cib.c b/tests/unittests/tests-core/tests-core-cib.c index fd371969a6..52565399ca 100644 --- a/tests/unittests/tests-core/tests-core-cib.c +++ b/tests/unittests/tests-core/tests-core-cib.c @@ -6,7 +6,7 @@ * directory for more details. */ -#include "embUnit/embUnit.h" +#include "embUnit.h" #include "cib.h" diff --git a/tests/unittests/tests-core/tests-core-clist.c b/tests/unittests/tests-core/tests-core-clist.c index 32e32887e2..3d19871c99 100644 --- a/tests/unittests/tests-core/tests-core-clist.c +++ b/tests/unittests/tests-core/tests-core-clist.c @@ -8,7 +8,7 @@ #include -#include "embUnit/embUnit.h" +#include "embUnit.h" #include "clist.h" diff --git a/tests/unittests/tests-core/tests-core-lifo.c b/tests/unittests/tests-core/tests-core-lifo.c index 43740b7d83..31eaa65d0d 100644 --- a/tests/unittests/tests-core/tests-core-lifo.c +++ b/tests/unittests/tests-core/tests-core-lifo.c @@ -6,7 +6,7 @@ * directory for more details. */ -#include "embUnit/embUnit.h" +#include "embUnit.h" #include "lifo.h" diff --git a/tests/unittests/tests-core/tests-core-priority-queue.c b/tests/unittests/tests-core/tests-core-priority-queue.c index 76875c9b7c..3f9357890d 100644 --- a/tests/unittests/tests-core/tests-core-priority-queue.c +++ b/tests/unittests/tests-core/tests-core-priority-queue.c @@ -7,7 +7,7 @@ */ #include -#include "embUnit/embUnit.h" +#include "embUnit.h" #include "priority_queue.h" diff --git a/tests/unittests/tests-core/tests-core.h b/tests/unittests/tests-core/tests-core.h index 8c4efb7161..47d425bc9f 100644 --- a/tests/unittests/tests-core/tests-core.h +++ b/tests/unittests/tests-core/tests-core.h @@ -18,7 +18,7 @@ #ifndef __TESTS_CORE_H_ #define __TESTS_CORE_H_ -#include "../unittests.h" +#include "embUnit.h" #ifdef __cplusplus extern "C" { diff --git a/tests/unittests/tests-crypto/tests-crypto.h b/tests/unittests/tests-crypto/tests-crypto.h index e63362e364..01483a73c0 100644 --- a/tests/unittests/tests-crypto/tests-crypto.h +++ b/tests/unittests/tests-crypto/tests-crypto.h @@ -18,7 +18,7 @@ #ifndef __TESTS_CRYPTO_H_ #define __TESTS_CRYPTO_H_ -#include "../unittests.h" +#include "embUnit.h" #ifdef __cplusplus extern "C" { diff --git a/tests/unittests/tests-netdev_dummy/tests-netdev_dummy.c b/tests/unittests/tests-netdev_dummy/tests-netdev_dummy.c index ebdb775909..c749547020 100644 --- a/tests/unittests/tests-netdev_dummy/tests-netdev_dummy.c +++ b/tests/unittests/tests-netdev_dummy/tests-netdev_dummy.c @@ -12,7 +12,7 @@ #include "clist.h" -#include "embUnit/embUnit.h" +#include "embUnit.h" #include "netdev_dummy.h" diff --git a/tests/unittests/tests-netdev_dummy/tests-netdev_dummy.h b/tests/unittests/tests-netdev_dummy/tests-netdev_dummy.h index 587811c769..ee8e456de8 100644 --- a/tests/unittests/tests-netdev_dummy/tests-netdev_dummy.h +++ b/tests/unittests/tests-netdev_dummy/tests-netdev_dummy.h @@ -18,7 +18,7 @@ #ifndef __TESTS_NETDEV_DUMMY_H_ #define __TESTS_NETDEV_DUMMY_H_ -#include "../unittests.h" +#include "embUnit.h" #ifdef __cplusplus extern "C" { diff --git a/tests/unittests/tests-pktbuf/tests-pktbuf.c b/tests/unittests/tests-pktbuf/tests-pktbuf.c index 7117220774..58e9176611 100644 --- a/tests/unittests/tests-pktbuf/tests-pktbuf.c +++ b/tests/unittests/tests-pktbuf/tests-pktbuf.c @@ -14,7 +14,7 @@ #include #include -#include "embUnit/embUnit.h" +#include "embUnit.h" #include "pktbuf.h" diff --git a/tests/unittests/tests-pktbuf/tests-pktbuf.h b/tests/unittests/tests-pktbuf/tests-pktbuf.h index cdfab7b9f0..a58eaa3104 100644 --- a/tests/unittests/tests-pktbuf/tests-pktbuf.h +++ b/tests/unittests/tests-pktbuf/tests-pktbuf.h @@ -18,7 +18,7 @@ #ifndef __TESTS_PKTBUF_H_ #define __TESTS_PKTBUF_H_ -#include "../unittests.h" +#include "embUnit.h" #ifdef __cplusplus extern "C" { diff --git a/tests/unittests/tests-pktqueue/tests-pktqueue.c b/tests/unittests/tests-pktqueue/tests-pktqueue.c index 19a717631c..e1752e8558 100644 --- a/tests/unittests/tests-pktqueue/tests-pktqueue.c +++ b/tests/unittests/tests-pktqueue/tests-pktqueue.c @@ -13,7 +13,7 @@ */ #include -#include "embUnit/embUnit.h" +#include "embUnit.h" #include "pktqueue.h" diff --git a/tests/unittests/tests-pktqueue/tests-pktqueue.h b/tests/unittests/tests-pktqueue/tests-pktqueue.h index b48260d6ec..968f78ca8b 100644 --- a/tests/unittests/tests-pktqueue/tests-pktqueue.h +++ b/tests/unittests/tests-pktqueue/tests-pktqueue.h @@ -18,7 +18,7 @@ #ifndef __TESTS_PKTQUEUE_H_ #define __TESTS_PKTQUEUE_H_ -#include "../unittests.h" +#include "embUnit.h" #ifdef __cplusplus extern "C" { @@ -29,7 +29,6 @@ extern "C" { */ void tests_pktqueue(void); - #ifdef __cplusplus } #endif diff --git a/tests/unittests/tests-timex/tests-timex.h b/tests/unittests/tests-timex/tests-timex.h index 50274e8880..5b0a974e3e 100644 --- a/tests/unittests/tests-timex/tests-timex.h +++ b/tests/unittests/tests-timex/tests-timex.h @@ -19,7 +19,7 @@ #ifndef __TESTS_TIMEX_H_ #define __TESTS_TIMEX_H_ -#include "../unittests.h" +#include "embUnit.h" #ifdef __cplusplus extern "C" { diff --git a/tests/unittests/tests-ubjson/test-ubjson-empty-array.c b/tests/unittests/tests-ubjson/test-ubjson-empty-array.c index 585a9da63f..56aba63fc0 100644 --- a/tests/unittests/tests-ubjson/test-ubjson-empty-array.c +++ b/tests/unittests/tests-ubjson/test-ubjson-empty-array.c @@ -17,6 +17,7 @@ */ #include "tests-ubjson.h" +#include "kernel.h" typedef enum { BEFORE_ARRAY_1 = __LINE__, diff --git a/tests/unittests/tests-ubjson/test-ubjson-empty-object.c b/tests/unittests/tests-ubjson/test-ubjson-empty-object.c index 359c61a74e..5e8f46a493 100644 --- a/tests/unittests/tests-ubjson/test-ubjson-empty-object.c +++ b/tests/unittests/tests-ubjson/test-ubjson-empty-object.c @@ -17,6 +17,7 @@ */ #include "tests-ubjson.h" +#include "kernel.h" typedef enum { BEFORE_ARRAY_1 = __LINE__, diff --git a/tests/unittests/tests-ubjson/tests-ubjson.c b/tests/unittests/tests-ubjson/tests-ubjson.c index bf83c83bd4..d11b9d24bc 100644 --- a/tests/unittests/tests-ubjson/tests-ubjson.c +++ b/tests/unittests/tests-ubjson/tests-ubjson.c @@ -22,6 +22,8 @@ #include "sched.h" #include "msg.h" #include "mutex.h" +#include "pipe.h" +#include "irq.h" static pipe_t communication_pipe; static ringbuffer_t pipe_rb; diff --git a/tests/unittests/tests-ubjson/tests-ubjson.h b/tests/unittests/tests-ubjson/tests-ubjson.h index 9b19c888ff..ef795c426a 100644 --- a/tests/unittests/tests-ubjson/tests-ubjson.h +++ b/tests/unittests/tests-ubjson/tests-ubjson.h @@ -29,13 +29,9 @@ #ifndef TESTS__UBJSON_H__ #define TESTS__UBJSON_H__ -#include "../unittests.h" -#include "msg.h" -#include "kernel_macros.h" -#include "irq.h" +#include "embUnit.h" #include "ubjson.h" -#include "pipe.h" #ifdef __cplusplus extern "C" {