From bb31ab5597a5a4299204f8c674f129506e0acdfe Mon Sep 17 00:00:00 2001 From: batt Date: Thu, 28 Aug 2008 14:30:52 +0000 Subject: [PATCH] Rename _TEST to ARCH_UNITTEST. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1744 38d2e660-2303-0410-9eaa-f027e97ec537 --- app/battfs/battfs_test.c | 2 +- bertos/cfg/test.h | 2 +- bertos/drv/lcd_hd44_test.c | 2 +- bertos/kern/proc_test.c | 2 +- bertos/mware/sprintf_test.c | 2 +- bertos/run_tests.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/battfs/battfs_test.c b/app/battfs/battfs_test.c index 8b13d597..c59d9a95 100644 --- 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 a05db372..85c4d427 100644 --- 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 5c5ace45..9fae8141 100644 --- 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 414f2115..e0030b7f 100644 --- 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 c790dc5f..8bcbabff 100644 --- 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 c931da76..d4225648 100755 --- 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" -- 2.25.1