From: bernie Date: Mon, 25 Aug 2008 11:30:26 +0000 (+0000) Subject: proc_test: Convert to new test policy X-Git-Tag: 2.0.0~249 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=c3a1182633d33dc083da6af30fa5e89018d7130a;p=bertos.git proc_test: Convert to new test policy git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1685 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/bertos/kern/proc_test.c b/bertos/kern/proc_test.c index a32d667e..32fde7e0 100644 --- a/bertos/kern/proc_test.c +++ b/bertos/kern/proc_test.c @@ -26,18 +26,18 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. * - * Copyright 2005 Develer S.r.l. (http://www.develer.com/) + * Copyright 2008 Develer S.r.l. (http://www.develer.com/) * --> * * * \brief Test kernel process. * * \version $Id$ - * * \author Daniele Basile */ #include +#include #include #include @@ -70,20 +70,6 @@ static cpustack_t proc_test1_stack[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t) static cpustack_t proc_test2_stack[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)]; -int proc_testSetup(void) -{ - kdbg_init(); - proc_init(); - IRQ_ENABLE; - timer_init(); - return 0; -} - -int proc_testTearDown(void) -{ - return 0; -} - /** * Process scheduling test */ @@ -93,12 +79,6 @@ int proc_testRun(void) proc_new(proc_test2, NULL, sizeof(proc_test2_stack), proc_test2_stack); kputs("Processes created\n"); - //kputs("stack1:\n"); - //kdump(proc_test_stack1 + sizeof(proc_test_stack1) - 64, 64); - - //kputs("stack2:\n"); - //kdump(proc_test_stack2 + sizeof(proc_test_stack2) - 64, 64); - for (int i = 0; i < 30; ++i) { kputs("> main\n"); @@ -107,21 +87,46 @@ int proc_testRun(void) } return 0; } -#warning Fix test to comply to new policy. -#if 0 -/* - * FIXME: to be compiled as a single file - * the kernel module needs the assembly switch function - * and the idle() that lay in a emulator cpp file. - * How can we fix this? - */ -#include TEST_ONLY(drv/kdebug.c) -#include TEST_ONLY(kern/coop.c) -#include TEST_ONLY(kern/proc.c) -#include TEST_ONLY(drv/timer.c) -#include TEST_ONLY(mware/formatwr.c) -#include TEST_ONLY(mware/hex.c) -#include TEST_ONLY(os/hptime.c) -TEST_MAIN(proc); +#ifdef _TEST + +int proc_testSetup(void) +{ + kdbg_init(); + + #if CONFIG_KERN_PREEMPT + irq_init(); + #endif + + timer_init(); + + proc_init(); + return 0; +} + +int proc_testTearDown(void) +{ + return 0; +} + +#include +#include +#include +#include +#include +#if CONFIG_KERN_PREEMPT + #include + #include +#else + #include + // FIXME: we need to link with the switch asm code too! #endif +#include +#include +#include +#include +#include + +TEST_MAIN(proc); + +#endif // _TEST