From dd61160701e176504fb62effca3def136a9ba67a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 11 May 2007 19:45:50 +0000 Subject: 2007-05-11 Joel Sherrill * base_sp/Makefile.am, hello/Makefile.am, iostream/Makefile.am, loopback/Makefile.am, nsecs/Makefile.am, pppd/Makefile.am, ticker/Makefile.am, ticker/system.h, unlimited/Makefile.am: Add optional managers to Makefiles. Clean up test cases so last output line follows END OF pattern. Make sure test case all run. All tests appeared ok on sis. * nsecs/init.c: Commit hack so test will compile when POSIX is disabled. Remove hack when clock_gettime() is present even when --disable-posix. --- testsuites/samples/ChangeLog | 12 ++++++++++++ testsuites/samples/base_sp/Makefile.am | 2 +- testsuites/samples/hello/Makefile.am | 2 +- testsuites/samples/iostream/Makefile.am | 2 +- testsuites/samples/loopback/Makefile.am | 2 +- testsuites/samples/nsecs/Makefile.am | 2 ++ testsuites/samples/nsecs/init.c | 12 +++++------- testsuites/samples/pppd/Makefile.am | 2 +- testsuites/samples/ticker/Makefile.am | 2 +- testsuites/samples/ticker/system.h | 5 +---- testsuites/samples/unlimited/Makefile.am | 2 +- 11 files changed, 27 insertions(+), 18 deletions(-) diff --git a/testsuites/samples/ChangeLog b/testsuites/samples/ChangeLog index f450645b1b..aba1e52c36 100644 --- a/testsuites/samples/ChangeLog +++ b/testsuites/samples/ChangeLog @@ -1,3 +1,15 @@ +2007-05-11 Joel Sherrill + + * base_sp/Makefile.am, hello/Makefile.am, iostream/Makefile.am, + loopback/Makefile.am, nsecs/Makefile.am, + pppd/Makefile.am, ticker/Makefile.am, ticker/system.h, + unlimited/Makefile.am: Add optional managers to Makefiles. Clean up + test cases so last output line follows END OF pattern. Make sure test + case all run. All tests appeared ok on sis. + * nsecs/init.c: Commit hack so test will compile when POSIX is + disabled. Remove hack when clock_gettime() is present even when + --disable-posix. + 2007-05-10 Joel Sherrill * ticker/Makefile.am, ticker/init.c, ticker/system.h, ticker/tasks.c: diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am index 7b2d9d5d69..2a324114ae 100644 --- a/testsuites/samples/base_sp/Makefile.am +++ b/testsuites/samples/base_sp/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -MANAGERS = io +MANAGERS = io semaphore rtems_tests_PROGRAMS = base_sp.exe base_sp_exe_SOURCES = init.c apptask.c system.h diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am index 883d6856ee..e1aa159fc8 100644 --- a/testsuites/samples/hello/Makefile.am +++ b/testsuites/samples/hello/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -MANAGERS = io +MANAGERS = io semaphore rtems_tests_PROGRAMS = hello.exe hello_exe_SOURCES = init.c system.h diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am index a2020fc702..bf333454b5 100644 --- a/testsuites/samples/iostream/Makefile.am +++ b/testsuites/samples/iostream/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -MANAGERS = io +MANAGERS = all rtems_tests_PROGRAMS = iostream.exe iostream_exe_SOURCES = init.cc system.h diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am index a03ddc85d0..26a7249467 100644 --- a/testsuites/samples/loopback/Makefile.am +++ b/testsuites/samples/loopback/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -MANAGERS = io event +MANAGERS = all rtems_tests_PROGRAMS = loopback.exe loopback_exe_SOURCES = init.c diff --git a/testsuites/samples/nsecs/Makefile.am b/testsuites/samples/nsecs/Makefile.am index 8e1404141e..bf9dd4ed7c 100644 --- a/testsuites/samples/nsecs/Makefile.am +++ b/testsuites/samples/nsecs/Makefile.am @@ -2,6 +2,8 @@ ## $Id$ ## +MANAGERS = all + rtems_tests_PROGRAMS = nsecs.exe nsecs_exe_SOURCES = init.c diff --git a/testsuites/samples/nsecs/init.c b/testsuites/samples/nsecs/init.c index f4f74203a3..32fc543761 100644 --- a/testsuites/samples/nsecs/init.c +++ b/testsuites/samples/nsecs/init.c @@ -69,21 +69,19 @@ rtems_task Init( for (index=0 ; index <10 ; index++ ) { struct timespec start, stop; struct timespec diff; +#if 0 clock_gettime( CLOCK_REALTIME, &start ); clock_gettime( CLOCK_REALTIME, &stop ); +#else + _TOD_Get( &start ); + _TOD_Get( &stop ); +#endif subtract_em( &start, &stop, &diff ); -#if 0 - printf( "%d:%d %d:%d ", - start.tv_sec, start.tv_nsec, - stop.tv_sec, stop.tv_nsec, - ); -#else printf( "Start: %s:%d\nStop : %s:%d", my_ctime(start.tv_sec), start.tv_nsec, my_ctime(stop.tv_sec), stop.tv_nsec ); -#endif printf( " --> %d:%d\n", diff.tv_sec, diff.tv_nsec ); } diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am index 9aec709f6c..b35817d081 100644 --- a/testsuites/samples/pppd/Makefile.am +++ b/testsuites/samples/pppd/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -MANAGERS = io event semaphore +MANAGERS = all rtems_tests_PROGRAMS = pppd.exe pppd_exe_SOURCES = init.c pppdapp.c netconfig.h system.h diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am index 8426951892..d8e4a2bf0e 100644 --- a/testsuites/samples/ticker/Makefile.am +++ b/testsuites/samples/ticker/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -MANAGERS = io clock +MANAGERS = all rtems_tests_PROGRAMS = ticker.exe ticker_exe_SOURCES = init.c tasks.c system.h diff --git a/testsuites/samples/ticker/system.h b/testsuites/samples/ticker/system.h index 0ae695486c..217ac4de83 100644 --- a/testsuites/samples/ticker/system.h +++ b/testsuites/samples/ticker/system.h @@ -41,11 +41,8 @@ extern rtems_name Task_name[ 4 ]; /* array of task names */ #include /* for device driver prototypes */ -#if defined(CONFIGURE_INIT) -int atexit(void (*function)(void)){} -#endif #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_DISABLE_NEWLIB_REENTRANCY +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER #define CONFIGURE_MAXIMUM_TASKS 4 diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am index 55d0b42d86..3b681cf2bb 100644 --- a/testsuites/samples/unlimited/Makefile.am +++ b/testsuites/samples/unlimited/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -MANAGERS = io event +MANAGERS = io event semaphore rtems_tests_PROGRAMS = unlimited.exe unlimited_exe_SOURCES = init.c test1.c test2.c test3.c system.h -- cgit v1.2.3