Drop the magical test macros.

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

diff --git a/bertos/cfg/nothing.h b/bertos/cfg/nothing.h
deleted file mode 100644 (file)
index 4c18a12..0000000
--- a/bertos/cfg/nothing.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * \file
- * <!--
- * This file is part of BeRTOS.
- *
- * Bertos is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction.  Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License.  This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- *
- * Copyright 2006 Develer S.r.l. (http://www.develer.com/)
- * All Rights Reserved.
- * -->
- *
- * \brief Empty file used to include "nothing" in macro expansion.
- *
- * If you want to conditionally include some file you can use this module 
- * as a dummy header:
- *
- * \code
- * #if COND
- *     #define MYHEADER <realheader.h>
- * #else
- *     #define MYHEADER <cfg/nothing.h>
- * #endif
- * \endcode
- *
- * \version $Id$
- *
- * \author Francesco Sacchi <batt@develer.com>
- */
-

diff --git a/bertos/cfg/test.h b/bertos/cfg/test.h
index 23ca14257e1489f69bca80de7f995e587c12b6fe..374250269fa0a54c073bc10800c2e8dc78c32ebb 100644 (file)
--- a/bertos/cfg/test.h
+++ b/bertos/cfg/test.h
@@ -75,33 +75,25 @@
 
 #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; \
-       }
-
-       /** This macro will include the specified file only in test-mode */
-       #define TEST_ONLY(file) PP_STRINGIZE(file)
-
-#else /* !_TEST */
+#else /* !TEST */
        #define UNIT_TEST 0
+#endif /* TEST */
 
-       #define TEST_MAIN(module)  /* nothing */
-       #define TEST_ONLY(file)    <cfg/nothing.h>
-
-#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 9c649a31f6321305f55acd8cda8e69b2d7e7ddf0..2171db0662960795b58850a38e1ed26d6d5e962b 100644 (file)
--- a/bertos/drv/timer_test.c
+++ b/bertos/drv/timer_test.c
@@ -154,12 +154,14 @@ int timer_testTearDown(void)
        return 0;
 }
 
-#include TEST_ONLY(drv/timer.c)
-#include TEST_ONLY(drv/kdebug.c)
-#include TEST_ONLY(mware/event.c)
-#include TEST_ONLY(mware/formatwr.c)
-#include TEST_ONLY(mware/hex.c)
-#include TEST_ONLY(os/hptime.c)
-
-TEST_MAIN(timer);
+#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