Fix unit test check.

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

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

diff --git a/bertos/cfg/test.h b/bertos/cfg/test.h
index 85c4d4276d93b7cbbb26cdb61c005e76a955acfa..b45515b044c1f110bd15fa7d76b9662b4183e777 100644 (file)
--- a/bertos/cfg/test.h
+++ b/bertos/cfg/test.h
@@ -71,7 +71,11 @@
 #ifndef CFG_TEST_H
 #define CFG_TEST_H
 
-#if (ARCH & ARCH_UNITTEST)
+#include "cfg/cfg_arch.h"
+
+#if defined(ARCH_UNITTEST) && (ARCH & ARCH_UNITTEST)
+
+       #define UNIT_TEST 1
 
        /**
         * Macro used to generate a main() for a test to be compiled
@@ -93,6 +97,7 @@
        #define TEST_ONLY(file) PP_STRINGIZE(file)
 
 #else /* !_TEST */
+       #define UNIT_TEST 0
 
        #define TEST_MAIN(module)  /* nothing */
        #define TEST_ONLY(file)    <cfg/nothing.h>

diff --git a/bertos/drv/lcd_hd44_test.c b/bertos/drv/lcd_hd44_test.c
index 9fae8141477ba65ca5803bce0ee833537fb2d8a0..065cee51a94008fadd40dffbebde6dc2ad52933f 100644 (file)
--- a/bertos/drv/lcd_hd44_test.c
+++ b/bertos/drv/lcd_hd44_test.c
@@ -40,11 +40,12 @@
 #include "lcd_hd44.h"
 #include "hw/hw_lcd.h"
 
+#include <cfg/test.h>
 #include <drv/timer.h>
 
 #warning TODO:Refactor this test to comply whit BeRTOS test policy.
 
-#if (ARCH & ARCH_UNITTEST)
+#if UNIT_TEST
 
 void lcd_hw_test(void)
 {

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

diff --git a/bertos/mware/sprintf_test.c b/bertos/mware/sprintf_test.c
index 8bcbabffd606255c4fc68cb690849b1f9a482c1f..60958fc5308d4df93b308ce5e31171d47f9c78db 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..
 
-#if (ARCH & ARCH_UNITTEST)
+#if UNIT_TEST
 #include "sprintf.c"
 #include "formatwr.c"
 #include "hex.c"