Rename _TEST to ARCH_UNITTEST.

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

diff --git a/app/battfs/battfs_test.c b/app/battfs/battfs_test.c
index 8b13d597e2ace29faf4d789713e87719ed9dc642..c59d9a95483c9ed216ec5674e48e765cd1ab28c3 100644 (file)
--- a/app/battfs/battfs_test.c
+++ b/app/battfs/battfs_test.c
@@ -538,7 +538,7 @@ int battfs_testRun(void)
        return 0;
 }
 
-#ifdef _TEST
+#if (ARCH & ARCH_UNITTEST)
 
 int battfs_testSetup(void)
 {

diff --git a/bertos/cfg/test.h b/bertos/cfg/test.h
index a05db372fb6e0cab0a41cac86dc82e6f3440fe22..85c4d4276d93b7cbbb26cdb61c005e76a955acfa 100644 (file)
--- a/bertos/cfg/test.h
+++ b/bertos/cfg/test.h
@@ -71,7 +71,7 @@
 #ifndef CFG_TEST_H
 #define CFG_TEST_H
 
-#ifdef _TEST
+#if (ARCH & ARCH_UNITTEST)
 
        /**
         * Macro used to generate a main() for a test to be compiled

diff --git a/bertos/drv/lcd_hd44_test.c b/bertos/drv/lcd_hd44_test.c
index 5c5ace45c524c3f9931dd54717af0d2bd0cc8c37..9fae8141477ba65ca5803bce0ee833537fb2d8a0 100644 (file)
--- a/bertos/drv/lcd_hd44_test.c
+++ b/bertos/drv/lcd_hd44_test.c
@@ -44,7 +44,7 @@
 
 #warning TODO:Refactor this test to comply whit BeRTOS test policy.
 
-#ifdef _TEST
+#if (ARCH & ARCH_UNITTEST)
 
 void lcd_hw_test(void)
 {

diff --git a/bertos/kern/proc_test.c b/bertos/kern/proc_test.c
index 414f2115f5213dc28dd49577ea0798f4e2c8a983..e0030b7f57598411d0173e33540461dfdcef802e 100644 (file)
--- a/bertos/kern/proc_test.c
+++ b/bertos/kern/proc_test.c
@@ -88,7 +88,7 @@ int proc_testRun(void)
        return 0;
 }
 
-#ifdef _TEST
+#if (ARCH & ARCH_UNITTEST)
 
 int proc_testSetup(void)
 {

diff --git a/bertos/mware/sprintf_test.c b/bertos/mware/sprintf_test.c
index c790dc5f27ce38484909f941fa22780873a3cfcb..8bcbabffd606255c4fc68cb690849b1f9a482c1f 100644 (file)
--- a/bertos/mware/sprintf_test.c
+++ b/bertos/mware/sprintf_test.c
@@ -49,7 +49,7 @@
 
 #warning FIXME:Review and refactor this test..
 
-#ifdef _TEST
+#if (ARCH & ARCH_UNITTEST)
 #include "sprintf.c"
 #include "formatwr.c"
 #include "hex.c"

diff --git a/bertos/run_tests.sh b/bertos/run_tests.sh
index c931da76f89cb0adbc3c56734e40c22d4c9c5568..d42256485c1af3e7f999ec8cfe488a1d1778259d 100755 (executable)
--- a/bertos/run_tests.sh
+++ b/bertos/run_tests.sh
@@ -17,7 +17,7 @@ VERBOSE=${VERBOSE:-1}
 
 CC=gcc
 #FIXME: -Ibertos/emul should not be needed
-CFLAGS="-W -Wall -Wextra -Ibertos -Ibertos/emul -std=gnu99 -fno-builtin -D_DEBUG -D_TEST -DARCH=ARCH_EMUL"
+CFLAGS="-W -Wall -Wextra -Ibertos -Ibertos/emul -std=gnu99 -fno-builtin -D_DEBUG -D'ARCH=(ARCH_EMUL|ARCH_UNITTEST)'"
 
 CXX=g++
 CXXFLAGS="$CFLAGS"