Remove c files inclusions: use libunittest instead.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1963 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/algo/ramp_test.c b/bertos/algo/ramp_test.c
index 918257f3a267a5ebb228442e71f0eb0c8d4e789e..7666662fb1ea515af44b3c13ac89b3b66a42287c 100644 (file)
--- a/bertos/algo/ramp_test.c
+++ b/bertos/algo/ramp_test.c
@@ -184,12 +184,4 @@ int ramp_testRun(void)
        return 0;
 }
 
-#if UNIT_TEST
-       #include "ramp.c"
-       #include <drv/kdebug.c>
-       #include <mware/formatwr.c>
-       #include <mware/hex.c>
-
-       TEST_MAIN(ramp);
-#endif
-
+TEST_MAIN(ramp);

diff --git a/bertos/cfg/test.h b/bertos/cfg/test.h
index 048ff57b8855b3de2192f10f90e0399ec5869474..ffa3a8d5e0fc932296375c68a53570c4f79c75a8 100644 (file)
--- a/bertos/cfg/test.h
+++ b/bertos/cfg/test.h
@@ -75,25 +75,28 @@
 
 #if defined(ARCH_UNITTEST) && (ARCH & ARCH_UNITTEST)
        #define UNIT_TEST 1
+
+       /**
+        * Macro used to generate a main() for a test to be compiled
+        * on hosted platform.
+        */
+       #define TEST_MAIN(module) \
+       int main(void) \
+       { \
+               if (module##_testSetup() != 0) \
+                       return 1; \
+               if (module##_testRun() != 0) \
+                       return 2; \
+               if (module##_testTearDown() != 0) \
+                       return 3; \
+               return 0; \
+       }
 #else /* !TEST */
        #define UNIT_TEST 0
+
+       #define TEST_MAIN(module) /* nothing */
 #endif /* TEST */
 
-/**
- * Macro used to generate a main() for a test to be compiled
- * on hosted platform.
- */
-#define TEST_MAIN(module) \
-int main(void) \
-{ \
-       if (module##_testSetup() != 0) \
-               return 1; \
-       if (module##_testRun() != 0) \
-               return 2; \
-       if (module##_testTearDown() != 0) \
-               return 3; \
-       return 0; \
-}
 
 /**
  * Silent an assert in a test.

diff --git a/bertos/drv/timer_test.c b/bertos/drv/timer_test.c
index a7839f41ebac382d957914324cec75a38d963189..07e75a66bf703b71f4e68ce4cd0d84a1e709257a 100644 (file)
--- a/bertos/drv/timer_test.c
+++ b/bertos/drv/timer_test.c
@@ -154,14 +154,5 @@ int timer_testTearDown(void)
        return 0;
 }
 
-#if UNIT_TEST
-       #include <drv/timer.c>
-       #include <drv/kdebug.c>
-       #include <mware/event.c>
-       #include <mware/formatwr.c>
-       #include <mware/hex.c>
-       #include <os/hptime.c>
-
-       TEST_MAIN(timer);
-#endif
+TEST_MAIN(timer);
 

diff --git a/bertos/fs/battfs_test.c b/bertos/fs/battfs_test.c
index dbaec18c4ea1f37780e8d4915ec10ff2723714c8..642e6d6423b179c60ee777f76a53c27cbc50b279 100644 (file)
--- a/bertos/fs/battfs_test.c
+++ b/bertos/fs/battfs_test.c
@@ -1144,12 +1144,6 @@ int battfs_testTearDown(void)
        return 0;
 }
 
-TEST_MAIN(battfs)
-
-#include <fs/battfs.c>
-#include <kern/kfile.c>
-#include <drv/kdebug.c>
-#include <mware/formatwr.c>
-#include <mware/hex.c>
+TEST_MAIN(battfs);
 
 #endif // _TEST

diff --git a/bertos/kern/proc_test.c b/bertos/kern/proc_test.c
index e06e984f660aef3581416d1c60758e47d75fefe9..dafd7cb92aa790e645aab58a376eeeafd0d4e214 100644 (file)
--- a/bertos/kern/proc_test.c
+++ b/bertos/kern/proc_test.c
@@ -91,7 +91,6 @@ int proc_testRun(void)
        return 0;
 }
 
-#if UNIT_TEST
 
 int proc_testSetup(void)
 {
@@ -112,24 +111,4 @@ int proc_testTearDown(void)
        return 0;
 }
 
-#include <drv/kdebug.c>
-#include <drv/timer.c>
-#include <kern/idle.c>
-#include <kern/monitor.c>
-#include <kern/signal.c>
-#if CONFIG_KERN_PREEMPT
-       #include <kern/preempt.c>
-       #include <kern/irq.c>
-#else
-       #include <kern/coop.c>
-       // FIXME: we need to link with the switch asm code too!
-#endif
-#include <kern/proc.c>
-#include <mware/formatwr.c>
-#include <mware/hex.c>
-#include <mware/event.c>
-#include <os/hptime.c>
-
 TEST_MAIN(proc);
-
-#endif // _TEST