X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Ftimer_test.c;h=694d18c565ed86ca35d402bc602433da8d00da77;hb=a2fc2366ad564f11e705703ed1f42b7dc499a47c;hp=3e9338a89bdb226bab6f635ac35b6968f0a5dd14;hpb=f58b90fce4022247d31d68ba1c0d3a620a9071d8;p=bertos.git

diff --git a/bertos/drv/timer_test.c b/bertos/drv/timer_test.c
index 3e9338a8..694d18c5 100644
--- a/bertos/drv/timer_test.c
+++ b/bertos/drv/timer_test.c
@@ -36,18 +36,16 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-#ifdef _TEST
-	#include "timer.c"
-	#include "mware/event.c"
-	#include "os/hptime.c"
+#include <cfg/test.h>
 
-#else
-	#include <drv/timer.c>
-	#include <mware/event.c>
-	#include <drv/wdt.h>
+#include <drv/timer.h>
+#include <drv/wdt.h>
 
-#endif
+#include <mware/event.h>
 
+#warning TODO:Refactor this test to comply whit BeRTOS test policy.
+
+#ifdef _TEST
 
 static void timer_test_constants(void)
 {
@@ -70,7 +68,7 @@ static void timer_test_constants(void)
 	kprintf("ticks_to_us(100)=%lu\n", ticks_to_us(100));
 	kprintf("ticks_to_us(10000)=%lu\n", ticks_to_us(10000));
 	kprintf("\n");
-	kprintf("hptime_to_us(100)=%lu\n", hptime_to_us(100));
+	kprintf("hptime_to_us(100)=%ld\n", hptime_to_us(100));
 	kprintf("hptime_to_us(10000)=%lu\n", hptime_to_us(10000));
 	kprintf("us_to_hptime(100)=%lu\n", us_to_hptime(100));
 	kprintf("us_to_hptime(10000)=%lu\n", us_to_hptime(10000));
@@ -131,6 +129,11 @@ static void timer_test_poll(void)
 	}
 }
 
+
+#include "timer.c"
+#include "mware/event.c"
+#include "os/hptime.c"
+
 int main(void)
 {
 	wdt_init(7);
@@ -141,3 +144,5 @@ int main(void)
 	timer_test_poll();
 	return 0;
 }
+#endif
+