diff options
Diffstat (limited to 'c/src/tests')
304 files changed, 2546 insertions, 1189 deletions
diff --git a/c/src/tests/itrontests/itronhello/Makefile.am b/c/src/tests/itrontests/itronhello/Makefile.am index 194ea819d2..5a2102990d 100644 --- a/c/src/tests/itrontests/itronhello/Makefile.am +++ b/c/src/tests/itrontests/itronhello/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itronhello PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) @@ -22,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(TEST).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/itrontests.am diff --git a/c/src/tests/itrontests/itronhello/system.h b/c/src/tests/itrontests/itronhello/system.h index ed516a778b..f74b1d985a 100644 --- a/c/src/tests/itrontests/itronhello/system.h +++ b/c/src/tests/itrontests/itronhello/system.h @@ -22,7 +22,9 @@ void ITRON_Init( void ); /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_ITRON_TASKS 1 #define CONFIGURE_ITRON_INIT_TASK_TABLE diff --git a/c/src/tests/itrontests/itronmbf01/Makefile.am b/c/src/tests/itrontests/itronmbf01/Makefile.am index 79d9eeafd9..d21723eda3 100644 --- a/c/src/tests/itrontests/itronmbf01/Makefile.am +++ b/c/src/tests/itrontests/itronmbf01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itronmbf01 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) @@ -22,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(TEST).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/itrontests.am diff --git a/c/src/tests/itrontests/itronmbf01/system.h b/c/src/tests/itrontests/itronmbf01/system.h index 391829bb03..0aa53f784a 100644 --- a/c/src/tests/itrontests/itronmbf01/system.h +++ b/c/src/tests/itrontests/itronmbf01/system.h @@ -22,11 +22,13 @@ void ITRON_Init( void ); /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_ITRON_INIT_TASK_TABLE +#define CONFIGURE_MAXIMUM_ITRON_TASKS 1 #define CONFIGURE_MAXIMUM_ITRON_MESSAGE_BUFFERS 10 + +#define CONFIGURE_ITRON_INIT_TASK_TABLE #define CONFIGURE_ITRON_INIT_TASK_STACK_SIZE (4 * RTEMS_MINIMUM_STACK_SIZE) #include <confdefs.h> diff --git a/c/src/tests/itrontests/itronmbox01/Makefile.am b/c/src/tests/itrontests/itronmbox01/Makefile.am index 434dbfc5d5..5d4ce5e507 100644 --- a/c/src/tests/itrontests/itronmbox01/Makefile.am +++ b/c/src/tests/itrontests/itronmbox01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itronmbox01 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) @@ -22,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(TEST).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/itrontests.am diff --git a/c/src/tests/itrontests/itronmbox01/itronmbox01.scn b/c/src/tests/itrontests/itronmbox01/itronmbox01.scn index e69de29bb2..89329090ba 100644 --- a/c/src/tests/itrontests/itronmbox01/itronmbox01.scn +++ b/c/src/tests/itrontests/itronmbox01/itronmbox01.scn @@ -0,0 +1,3 @@ +*** ITRON MBOX TEST 01 *** +ITRON Mailboxes are implemented but there is currently no test. +*** END OF ITRON MBOX TEST 01 *** diff --git a/c/src/tests/itrontests/itronmbox01/system.h b/c/src/tests/itrontests/itronmbox01/system.h index d400584887..3482ffa2a1 100644 --- a/c/src/tests/itrontests/itronmbox01/system.h +++ b/c/src/tests/itrontests/itronmbox01/system.h @@ -22,7 +22,9 @@ void ITRON_Init( void ); /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_ITRON_TASKS 1 #define CONFIGURE_ITRON_INIT_TASK_TABLE diff --git a/c/src/tests/itrontests/itronsem01/Makefile.am b/c/src/tests/itrontests/itronsem01/Makefile.am index 0935883bb4..bfd003896f 100644 --- a/c/src/tests/itrontests/itronsem01/Makefile.am +++ b/c/src/tests/itrontests/itronsem01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itronsem01 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) @@ -22,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(TEST).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/itrontests.am diff --git a/c/src/tests/itrontests/itronsem01/init.c b/c/src/tests/itrontests/itronsem01/init.c index e90d9d8537..44aaff3912 100644 --- a/c/src/tests/itrontests/itronsem01/init.c +++ b/c/src/tests/itrontests/itronsem01/init.c @@ -54,6 +54,7 @@ void ITRON_Init( void ) assert( status == E_PAR ); puts( "Init - cre_sem - isemcnt > maxsem returns E_PAR" ); + pk_csem.sematr = 0; pk_csem.isemcnt = 3; pk_csem.maxsem = 2; status = cre_sem( 1, &pk_csem ); diff --git a/c/src/tests/itrontests/itronsem01/system.h b/c/src/tests/itrontests/itronsem01/system.h index 6989ad101b..ad7fe1fb12 100644 --- a/c/src/tests/itrontests/itronsem01/system.h +++ b/c/src/tests/itrontests/itronsem01/system.h @@ -23,12 +23,14 @@ void ITRON_Init( void ); /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_ITRON_INIT_TASK_TABLE +#define CONFIGURE_MAXIMUM_ITRON_TASKS 1 #define CONFIGURE_MAXIMUM_ITRON_SEMAPHORES 10 +#define CONFIGURE_ITRON_INIT_TASK_TABLE + #include <confdefs.h> /* global variables */ diff --git a/c/src/tests/itrontests/itrontask01/Makefile.am b/c/src/tests/itrontests/itrontask01/Makefile.am index e3d6d007f4..8cb34e5789 100644 --- a/c/src/tests/itrontests/itrontask01/Makefile.am +++ b/c/src/tests/itrontests/itrontask01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itrontask01 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) @@ -22,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(TEST).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/itrontests.am diff --git a/c/src/tests/itrontests/itrontask01/system.h b/c/src/tests/itrontests/itrontask01/system.h index 9974522892..fdd13f271a 100644 --- a/c/src/tests/itrontests/itrontask01/system.h +++ b/c/src/tests/itrontests/itrontask01/system.h @@ -23,8 +23,10 @@ void Task_2_through_4(); /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_ITRON_TASKS 4 #define CONFIGURE_ITRON_INIT_TASK_TABLE diff --git a/c/src/tests/itrontests/itrontask02/Makefile.am b/c/src/tests/itrontests/itrontask02/Makefile.am index c9a13f63d4..89035793fe 100644 --- a/c/src/tests/itrontests/itrontask02/Makefile.am +++ b/c/src/tests/itrontests/itrontask02/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itrontask02 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c dormant.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) @@ -22,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(TEST).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/itrontests.am diff --git a/c/src/tests/itrontests/itrontask02/system.h b/c/src/tests/itrontests/itrontask02/system.h index df868d6c48..31498a5d3a 100644 --- a/c/src/tests/itrontests/itrontask02/system.h +++ b/c/src/tests/itrontests/itrontask02/system.h @@ -24,7 +24,10 @@ void Non_Dormant_task(); /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_ITRON_TASKS 5 + #define CONFIGURE_ITRON_INIT_TASK_TABLE #include <confdefs.h> diff --git a/c/src/tests/itrontests/itrontask03/Makefile.am b/c/src/tests/itrontests/itrontask03/Makefile.am index 3d1751e714..779e2f0952 100644 --- a/c/src/tests/itrontests/itrontask03/Makefile.am +++ b/c/src/tests/itrontests/itrontask03/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itrontask03 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c preempt.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) @@ -22,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(TEST).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/itrontests.am diff --git a/c/src/tests/itrontests/itrontask03/system.h b/c/src/tests/itrontests/itrontask03/system.h index 3f7a585bb2..762fc95d8c 100644 --- a/c/src/tests/itrontests/itrontask03/system.h +++ b/c/src/tests/itrontests/itrontask03/system.h @@ -26,8 +26,11 @@ void Task_3(); /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_ITRON_TASKS 6 + #define CONFIGURE_ITRON_INIT_TASK_TABLE #include <confdefs.h> diff --git a/c/src/tests/itrontests/itrontask04/Makefile.am b/c/src/tests/itrontests/itrontask04/Makefile.am index f4713a718d..063062ebf3 100644 --- a/c/src/tests/itrontests/itrontask04/Makefile.am +++ b/c/src/tests/itrontests/itrontask04/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itrontask04 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) @@ -22,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(TEST).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/itrontests.am diff --git a/c/src/tests/itrontests/itrontask04/system.h b/c/src/tests/itrontests/itrontask04/system.h index f9cc60958f..d0715d08e2 100644 --- a/c/src/tests/itrontests/itrontask04/system.h +++ b/c/src/tests/itrontests/itrontask04/system.h @@ -26,8 +26,11 @@ void Task_3(); /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_ITRON_TASKS 5 + #define CONFIGURE_ITRON_INIT_TASK_TABLE #include <confdefs.h> diff --git a/c/src/tests/itrontests/itrontime01/Makefile.am b/c/src/tests/itrontests/itrontime01/Makefile.am index 03d4ea878c..19c9538920 100644 --- a/c/src/tests/itrontests/itrontime01/Makefile.am +++ b/c/src/tests/itrontests/itrontime01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itrontime01 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) @@ -22,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(TEST).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/itrontests.am diff --git a/c/src/tests/itrontests/itrontime01/itrontime01.scn b/c/src/tests/itrontests/itrontime01/itrontime01.scn index e69de29bb2..c76eb631fd 100644 --- a/c/src/tests/itrontests/itrontime01/itrontime01.scn +++ b/c/src/tests/itrontests/itrontime01/itrontime01.scn @@ -0,0 +1,4 @@ +*** ITRON TIME TEST 01 *** +The Time Services are not completely implemented. +*** END OF ITRON TIME TEST 01 *** + diff --git a/c/src/tests/itrontests/itrontime01/system.h b/c/src/tests/itrontests/itrontime01/system.h index d400584887..3482ffa2a1 100644 --- a/c/src/tests/itrontests/itrontime01/system.h +++ b/c/src/tests/itrontests/itrontime01/system.h @@ -22,7 +22,9 @@ void ITRON_Init( void ); /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_ITRON_TASKS 1 #define CONFIGURE_ITRON_INIT_TASK_TABLE diff --git a/c/src/tests/libtests/cpuuse/Makefile.am b/c/src/tests/libtests/cpuuse/Makefile.am index e630c15cb1..3ab0a2ff2c 100644 --- a/c/src/tests/libtests/cpuuse/Makefile.am +++ b/c/src/tests/libtests/cpuuse/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = cpuuse MANAGERS = io rate_monotonic @@ -11,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c tswitch.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/cpuuse/cpuuse.scn b/c/src/tests/libtests/cpuuse/cpuuse.scn index f104c0c482..b45cf91136 100644 --- a/c/src/tests/libtests/cpuuse/cpuuse.scn +++ b/c/src/tests/libtests/cpuuse/cpuuse.scn @@ -1,24 +1,34 @@ -*** TEST 4 *** -TA1 - 09:15:00 12/31/1988 +*** CPU USAGE LIBRARY TEST *** TA1 - rtems_task_suspend - on Task 2 TA1 - rtems_task_suspend - on Task 3 TA1 - killing time TA1 - rtems_task_resume - on Task 2 TA1 - rtems_task_resume - on Task 3 -TA2 - 09:15:03 12/31/1988 -TA3 - 09:15:04 12/31/1988 -TA1 - 09:15:05 12/31/1988 -TA2 - 09:15:06 12/31/1988 -TA3 - 09:15:07 12/31/1988 -TA1 - 09:15:08 12/31/1988 TA1 - rtems_task_mode - change mode to NO RTEMS_PREEMPT -TA1 - 09:15:09 12/31/1988 TA1 - 09:15:10 12/31/1988 TA1 - 09:15:11 12/31/1988 TA1 - 09:15:12 12/31/1988 TA1 - 09:15:13 12/31/1988 TA1 - 09:15:14 12/31/1988 +TA1 - 09:15:15 12/31/1988 TA1 - rtems_task_mode - change mode to RTEMS_PREEMPT -TA2 - 09:15:15 12/31/1988 -TA3 - 09:15:16 12/31/1988 -*** END OF TEST 4 *** +TA1 - 09:15:00 12/31/1988 +TA2 - 09:15:04 12/31/1988 +TA3 - 09:15:05 12/31/1988 +TA1 - 09:15:06 12/31/1988 +TA2 - 09:15:07 12/31/1988 +TA3 - 09:15:08 12/31/1988 +TA1 - 09:15:09 12/31/1988 +TA2 - 09:15:16 12/31/1988 +CPU Usage by thread + ID NAME TICKS PERCENT +0x04010001 IDLE 0 0.000 +0x08010002 TA1 1203 0.748 +0x08010003 TA2 204 0.127 +0x08010004 TA3 202 0.126 + +Ticks since last reset = 1601 + +Total Units = 1609 +*** END OF CPU USAGE LIBRARY TEST *** +NOTE: Actual time per task will vary but there should be no IDLE time. diff --git a/c/src/tests/libtests/cpuuse/system.h b/c/src/tests/libtests/cpuuse/system.h index 83aa39f121..f99c6eb647 100644 --- a/c/src/tests/libtests/cpuuse/system.h +++ b/c/src/tests/libtests/cpuuse/system.h @@ -40,12 +40,11 @@ void Task_switch( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1 +#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_TICKS_PER_TIMESLICE 100 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE @@ -64,5 +63,19 @@ TEST_EXTERN rtems_name Extension_name[ 4 ]; /* array of task names */ /* array of task run counts */ TEST_EXTERN volatile rtems_unsigned32 Run_count[ 4 ]; + +/* + * Keep track of task switches + */ + +struct taskSwitchLog { + int taskIndex; + rtems_time_of_day when; +}; + +extern struct taskSwitchLog taskSwitchLog[]; +extern int taskSwitchLogIndex; +volatile extern int testsFinished; + /* end of include file */ diff --git a/c/src/tests/libtests/cpuuse/task2.c b/c/src/tests/libtests/cpuuse/task2.c index 5dbdda331d..8a9880d0ba 100644 --- a/c/src/tests/libtests/cpuuse/task2.c +++ b/c/src/tests/libtests/cpuuse/task2.c @@ -20,9 +20,28 @@ #include "system.h" +#include <rtems/cpuuse.h> + +static void +showTaskSwitches (void) +{ + int i; + int switches = taskSwitchLogIndex; + + for (i = 0 ; i < switches ; i++) { + put_name( Task_name[taskSwitchLog[i].taskIndex], FALSE ); + print_time( "- ", &taskSwitchLog[i].when, "\n" ); + } +} + rtems_task Task_2( rtems_task_argument argument ) { - while( FOREVER ); + while ( !testsFinished ); + + showTaskSwitches (); + CPU_usage_Dump(); + puts( "*** END OF CPU USAGE LIBRARY TEST ***" ); + exit( 0 ); } diff --git a/c/src/tests/libtests/cpuuse/tswitch.c b/c/src/tests/libtests/cpuuse/tswitch.c index f083709497..56a53770a7 100644 --- a/c/src/tests/libtests/cpuuse/tswitch.c +++ b/c/src/tests/libtests/cpuuse/tswitch.c @@ -22,7 +22,9 @@ #include "system.h" -#include <rtems/cpuuse.h> +struct taskSwitchLog taskSwitchLog[1000]; +int taskSwitchLogIndex; +volatile int testsFinished;; rtems_extension Task_switch( rtems_tcb *unused, @@ -42,16 +44,18 @@ rtems_extension Task_switch( Run_count[ index ] += 1; status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time ); - directive_failed( status, "rtems_clock_get" ); + fatal_directive_status_with_level( status, RTEMS_SUCCESSFUL, + "rtems_clock_get", 1 ); - put_name( Task_name[ index ], FALSE ); - print_time( "- ", &time, "\n" ); - - if ( time.second >= 16 ) { - CPU_usage_Dump(); - puts( "*** END OF CPU USAGE LIBRARY TEST ***" ); - exit( 0 ); + if (taskSwitchLogIndex < + (sizeof taskSwitchLog / sizeof taskSwitchLog[0])) { + taskSwitchLog[taskSwitchLogIndex].taskIndex = index; + taskSwitchLog[taskSwitchLogIndex].when = time; + taskSwitchLogIndex++; } + if ( time.second >= 16 ) + testsFinished = 1; + break; case 0: diff --git a/c/src/tests/libtests/malloctest/Makefile.am b/c/src/tests/libtests/malloctest/Makefile.am index 70ca6e7add..7cad5cfe92 100644 --- a/c/src/tests/libtests/malloctest/Makefile.am +++ b/c/src/tests/libtests/malloctest/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = malloctest MANAGERS = io @@ -11,9 +12,9 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) -DOCTYPES = +DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) SRCS = $(DOCS) $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) diff --git a/c/src/tests/libtests/malloctest/malloctest.scn b/c/src/tests/libtests/malloctest/malloctest.scn index e69de29bb2..1e75d9a8f7 100644 --- a/c/src/tests/libtests/malloctest/malloctest.scn +++ b/c/src/tests/libtests/malloctest/malloctest.scn @@ -0,0 +1,468 @@ +*** MALLOC TEST *** +TA1 - rtems_clock_get - 09:00:00 12/31/1988 +mallocing 513 bytes +TA2 - rtems_clock_get - 09:00:00 12/31/1988 +mallocing 513 bytes +TA3 - rtems_clock_get - 09:00:00 12/31/1988 +mallocing 513 bytes +TA4 - rtems_clock_get - 09:00:00 12/31/1988 +mallocing 513 bytes +TA5 - rtems_clock_get - 09:00:00 12/31/1988 +mallocing 513 bytes +TA1 - rtems_clock_get - 09:00:00 12/31/1988 +mallocing 175 bytes +TA2 - rtems_clock_get - 09:00:00 12/31/1988 +mallocing 175 bytes +TA1 - rtems_clock_get - 09:00:00 12/31/1988 +mallocing 308 bytes +TA3 - rtems_clock_get - 09:00:00 12/31/1988 +mallocing 175 bytes +TA1 - rtems_clock_get - 09:00:00 12/31/1988 +mallocing 534 bytes +TA2 - rtems_clock_get - 09:00:01 12/31/1988 +mallocing 308 bytes +TA4 - rtems_clock_get - 09:00:01 12/31/1988 +mallocing 175 bytes +TA1 - rtems_clock_get - 09:00:01 12/31/1988 +mallocing 947 bytes +TA5 - rtems_clock_get - 09:00:01 12/31/1988 +mallocing 175 bytes +TA1 - rtems_clock_get - 09:00:01 12/31/1988 +mallocing 171 bytes +TA2 - rtems_clock_get - 09:00:01 12/31/1988 +mallocing 534 bytes +TA3 - rtems_clock_get - 09:00:01 12/31/1988 +mallocing 308 bytes +TA1 - rtems_clock_get - 09:00:01 12/31/1988 +mallocing 702 bytes +TA1 - rtems_clock_get - 09:00:01 12/31/1988 +mallocing 226 bytes +TA2 - rtems_clock_get - 09:00:02 12/31/1988 +mallocing 947 bytes +TA4 - rtems_clock_get - 09:00:02 12/31/1988 +mallocing 308 bytes +TA1 - rtems_clock_get - 09:00:02 12/31/1988 +mallocing 494 bytes +TA3 - rtems_clock_get - 09:00:02 12/31/1988 +mallocing 534 bytes +TA1 - rtems_clock_get - 09:00:02 12/31/1988 +mallocing 124 bytes +TA2 - rtems_clock_get - 09:00:02 12/31/1988 +mallocing 171 bytes +TA5 - rtems_clock_get - 09:00:02 12/31/1988 +mallocing 308 bytes +TA1 - rtems_clock_get - 09:00:02 12/31/1988 +mallocing 83 bytes +TA1 - rtems_clock_get - 09:00:02 12/31/1988 +mallocing 389 bytes +TA2 - rtems_clock_get - 09:00:03 12/31/1988 +mallocing 702 bytes +TA4 - rtems_clock_get - 09:00:03 12/31/1988 +mallocing 534 bytes +TA3 - rtems_clock_get - 09:00:03 12/31/1988 +mallocing 947 bytes +TA1 - rtems_clock_get - 09:00:03 12/31/1988 +mallocing 277 bytes +TA1 - rtems_clock_get - 09:00:03 12/31/1988 +mallocing 368 bytes +TA2 - rtems_clock_get - 09:00:03 12/31/1988 +mallocing 226 bytes +TA1 - rtems_clock_get - 09:00:03 12/31/1988 +mallocing 983 bytes +TA5 - rtems_clock_get - 09:00:03 12/31/1988 +mallocing 534 bytes +TA3 - rtems_clock_get - 09:00:03 12/31/1988 +mallocing 171 bytes +TA1 - rtems_clock_get - 09:00:03 12/31/1988 +mallocing 535 bytes +TA2 - rtems_clock_get - 09:00:04 12/31/1988 +mallocing 494 bytes +TA4 - rtems_clock_get - 09:00:04 12/31/1988 +mallocing 947 bytes +TA1 - rtems_clock_get - 09:00:04 12/31/1988 +mallocing 765 bytes +TA1 - rtems_clock_get - 09:00:04 12/31/1988 +mallocing 646 bytes +TA2 - rtems_clock_get - 09:00:04 12/31/1988 +mallocing 124 bytes +TA3 - rtems_clock_get - 09:00:04 12/31/1988 +mallocing 702 bytes +TA1 - rtems_clock_get - 09:00:04 12/31/1988 +mallocing 767 bytes +TA1 - rtems_clock_get - 09:00:04 12/31/1988 +mallocing 780 bytes +TA2 - rtems_clock_get - 09:00:05 12/31/1988 +mallocing 83 bytes +TA4 - rtems_clock_get - 09:00:05 12/31/1988 +mallocing 171 bytes +TA5 - rtems_clock_get - 09:00:05 12/31/1988 +mallocing 947 bytes +TA1 - rtems_clock_get - 09:00:05 12/31/1988 +mallocing 822 bytes +TA3 - rtems_clock_get - 09:00:05 12/31/1988 +mallocing 226 bytes +TA1 - rtems_clock_get - 09:00:05 12/31/1988 +mallocing 151 bytes +TA2 - rtems_clock_get - 09:00:05 12/31/1988 +mallocing 389 bytes +TA1 - rtems_clock_get - 09:00:05 12/31/1988 +mallocing 625 bytes +TA1 - rtems_clock_get - 09:00:05 12/31/1988 +mallocing 314 bytes +TA2 - rtems_clock_get - 09:00:06 12/31/1988 +mallocing 277 bytes +TA4 - rtems_clock_get - 09:00:06 12/31/1988 +mallocing 702 bytes +TA3 - rtems_clock_get - 09:00:06 12/31/1988 +mallocing 494 bytes +TA1 - rtems_clock_get - 09:00:06 12/31/1988 +mallocing 346 bytes +TA5 - rtems_clock_get - 09:00:06 12/31/1988 +mallocing 171 bytes +TA1 - rtems_clock_get - 09:00:06 12/31/1988 +mallocing 917 bytes +TA2 - rtems_clock_get - 09:00:06 12/31/1988 +mallocing 368 bytes +TA1 - rtems_clock_get - 09:00:06 12/31/1988 +mallocing 519 bytes +TA3 - rtems_clock_get - 09:00:06 12/31/1988 +mallocing 124 bytes +TA1 - rtems_clock_get - 09:00:06 12/31/1988 +mallocing 401 bytes +TA2 - rtems_clock_get - 09:00:07 12/31/1988 +mallocing 983 bytes +TA4 - rtems_clock_get - 09:00:07 12/31/1988 +mallocing 226 bytes +TA1 - rtems_clock_get - 09:00:07 12/31/1988 +mallocing 606 bytes +TA1 - rtems_clock_get - 09:00:07 12/31/1988 +mallocing 785 bytes +TA2 - rtems_clock_get - 09:00:07 12/31/1988 +mallocing 535 bytes +TA5 - rtems_clock_get - 09:00:07 12/31/1988 +mallocing 702 bytes +TA3 - rtems_clock_get - 09:00:07 12/31/1988 +mallocing 83 bytes +TA1 - rtems_clock_get - 09:00:07 12/31/1988 +mallocing 931 bytes +TA1 - rtems_clock_get - 09:00:07 12/31/1988 +mallocing 869 bytes +TA2 - rtems_clock_get - 09:00:08 12/31/1988 +mallocing 765 bytes +TA4 - rtems_clock_get - 09:00:08 12/31/1988 +mallocing 494 bytes +TA1 - rtems_clock_get - 09:00:08 12/31/1988 +mallocing 866 bytes +TA3 - rtems_clock_get - 09:00:08 12/31/1988 +mallocing 389 bytes +TA1 - rtems_clock_get - 09:00:08 12/31/1988 +mallocing 674 bytes +TA2 - rtems_clock_get - 09:00:08 12/31/1988 +mallocing 646 bytes +TA1 - rtems_clock_get - 09:00:08 12/31/1988 +mallocing 758 bytes +TA5 - rtems_clock_get - 09:00:08 12/31/1988 +mallocing 226 bytes +TA1 - rtems_clock_get - 09:00:08 12/31/1988 +mallocing 581 bytes +TA2 - rtems_clock_get - 09:00:09 12/31/1988 +mallocing 767 bytes +TA4 - rtems_clock_get - 09:00:09 12/31/1988 +mallocing 124 bytes +TA3 - rtems_clock_get - 09:00:09 12/31/1988 +mallocing 277 bytes +TA1 - rtems_clock_get - 09:00:09 12/31/1988 +mallocing 389 bytes +TA1 - rtems_clock_get - 09:00:09 12/31/1988 +mallocing 355 bytes +TA2 - rtems_clock_get - 09:00:09 12/31/1988 +mallocing 780 bytes +TA1 - rtems_clock_get - 09:00:09 12/31/1988 +mallocing 200 bytes +TA3 - rtems_clock_get - 09:00:09 12/31/1988 +mallocing 368 bytes +TA1 - rtems_clock_get - 09:00:09 12/31/1988 +mallocing 826 bytes +TA2 - rtems_clock_get - 09:00:10 12/31/1988 +mallocing 822 bytes +TA4 - rtems_clock_get - 09:00:10 12/31/1988 +mallocing 83 bytes +TA5 - rtems_clock_get - 09:00:10 12/31/1988 +mallocing 494 bytes +TA1 - rtems_clock_get - 09:00:10 12/31/1988 +mallocing 415 bytes +TA1 - rtems_clock_get - 09:00:10 12/31/1988 +mallocing 463 bytes +TA2 - rtems_clock_get - 09:00:10 12/31/1988 +mallocing 151 bytes +TA3 - rtems_clock_get - 09:00:10 12/31/1988 +mallocing 983 bytes +TA1 - rtems_clock_get - 09:00:10 12/31/1988 +mallocing 979 bytes +TA1 - rtems_clock_get - 09:00:10 12/31/1988 +mallocing 126 bytes +TA2 - rtems_clock_get - 09:00:11 12/31/1988 +mallocing 625 bytes +TA4 - rtems_clock_get - 09:00:11 12/31/1988 +mallocing 389 bytes +TA1 - rtems_clock_get - 09:00:11 12/31/1988 +mallocing 212 bytes +TA5 - rtems_clock_get - 09:00:11 12/31/1988 +mallocing 124 bytes +TA3 - rtems_clock_get - 09:00:11 12/31/1988 +mallocing 535 bytes +TA1 - rtems_clock_get - 09:00:11 12/31/1988 +mallocing 958 bytes +TA2 - rtems_clock_get - 09:00:11 12/31/1988 +mallocing 314 bytes +TA1 - rtems_clock_get - 09:00:11 12/31/1988 +mallocing 737 bytes +TA1 - rtems_clock_get - 09:00:11 12/31/1988 +mallocing 409 bytes +TA2 - rtems_clock_get - 09:00:12 12/31/1988 +mallocing 346 bytes +TA4 - rtems_clock_get - 09:00:12 12/31/1988 +mallocing 277 bytes +TA3 - rtems_clock_get - 09:00:12 12/31/1988 +mallocing 765 bytes +TA1 - rtems_clock_get - 09:00:12 12/31/1988 +mallocing 780 bytes +TA1 - rtems_clock_get - 09:00:12 12/31/1988 +mallocing 757 bytes +TA2 - rtems_clock_get - 09:00:12 12/31/1988 +mallocing 917 bytes +TA5 - rtems_clock_get - 09:00:12 12/31/1988 +mallocing 83 bytes +TA1 - rtems_clock_get - 09:00:12 12/31/1988 +mallocing 956 bytes +TA3 - rtems_clock_get - 09:00:12 12/31/1988 +mallocing 646 bytes +TA1 - rtems_clock_get - 09:00:12 12/31/1988 +mallocing 28 bytes +TA2 - rtems_clock_get - 09:00:13 12/31/1988 +mallocing 519 bytes +TA4 - rtems_clock_get - 09:00:13 12/31/1988 +mallocing 368 bytes +TA1 - rtems_clock_get - 09:00:13 12/31/1988 +mallocing 318 bytes +TA1 - rtems_clock_get - 09:00:13 12/31/1988 +mallocing 756 bytes +TA2 - rtems_clock_get - 09:00:13 12/31/1988 +mallocing 401 bytes +TA3 - rtems_clock_get - 09:00:13 12/31/1988 +mallocing 767 bytes +TA1 - rtems_clock_get - 09:00:13 12/31/1988 +mallocing 242 bytes +TA5 - rtems_clock_get - 09:00:13 12/31/1988 +mallocing 389 bytes +TA1 - rtems_clock_get - 09:00:13 12/31/1988 +mallocing 589 bytes +TA2 - rtems_clock_get - 09:00:14 12/31/1988 +mallocing 606 bytes +TA4 - rtems_clock_get - 09:00:14 12/31/1988 +mallocing 983 bytes +TA1 - rtems_clock_get - 09:00:14 12/31/1988 +mallocing 43 bytes +TA3 - rtems_clock_get - 09:00:14 12/31/1988 +mallocing 780 bytes +TA1 - rtems_clock_get - 09:00:14 12/31/1988 +mallocing 956 bytes +TA2 - rtems_clock_get - 09:00:14 12/31/1988 +mallocing 785 bytes +TA1 - rtems_clock_get - 09:00:14 12/31/1988 +mallocing 319 bytes +TA1 - rtems_clock_get - 09:00:14 12/31/1988 +mallocing 59 bytes +TA2 - rtems_clock_get - 09:00:15 12/31/1988 +mallocing 931 bytes +TA4 - rtems_clock_get - 09:00:15 12/31/1988 +mallocing 535 bytes +TA5 - rtems_clock_get - 09:00:15 12/31/1988 +mallocing 277 bytes +TA3 - rtems_clock_get - 09:00:15 12/31/1988 +mallocing 822 bytes +TA1 - rtems_clock_get - 09:00:15 12/31/1988 +mallocing 441 bytes +TA1 - rtems_clock_get - 09:00:15 12/31/1988 +mallocing 915 bytes +TA2 - rtems_clock_get - 09:00:15 12/31/1988 +mallocing 869 bytes +TA1 - rtems_clock_get - 09:00:15 12/31/1988 +mallocing 572 bytes +TA3 - rtems_clock_get - 09:00:15 12/31/1988 +mallocing 151 bytes +TA1 - rtems_clock_get - 09:00:15 12/31/1988 +mallocing 118 bytes +TA2 - rtems_clock_get - 09:00:16 12/31/1988 +mallocing 866 bytes +TA4 - rtems_clock_get - 09:00:16 12/31/1988 +mallocing 765 bytes +TA1 - rtems_clock_get - 09:00:16 12/31/1988 +mallocing 569 bytes +TA5 - rtems_clock_get - 09:00:16 12/31/1988 +mallocing 368 bytes +TA1 - rtems_clock_get - 09:00:16 12/31/1988 +mallocing 252 bytes +TA2 - rtems_clock_get - 09:00:16 12/31/1988 +mallocing 674 bytes +TA3 - rtems_clock_get - 09:00:16 12/31/1988 +mallocing 625 bytes +TA1 - rtems_clock_get - 09:00:16 12/31/1988 +mallocing 495 bytes +TA1 - rtems_clock_get - 09:00:16 12/31/1988 +mallocing 236 bytes +TA2 - rtems_clock_get - 09:00:17 12/31/1988 +mallocing 758 bytes +TA4 - rtems_clock_get - 09:00:17 12/31/1988 +mallocing 646 bytes +TA1 - rtems_clock_get - 09:00:17 12/31/1988 +mallocing 476 bytes +TA3 - rtems_clock_get - 09:00:17 12/31/1988 +mallocing 314 bytes +TA1 - rtems_clock_get - 09:00:17 12/31/1988 +mallocing 406 bytes +TA2 - rtems_clock_get - 09:00:17 12/31/1988 +mallocing 581 bytes +TA5 - rtems_clock_get - 09:00:17 12/31/1988 +mallocing 983 bytes +TA1 - rtems_clock_get - 09:00:17 12/31/1988 +mallocing 872 bytes +TA1 - rtems_clock_get - 09:00:17 12/31/1988 +mallocing 426 bytes +TA2 - rtems_clock_get - 09:00:18 12/31/1988 +mallocing 389 bytes +TA4 - rtems_clock_get - 09:00:18 12/31/1988 +mallocing 767 bytes +TA3 - rtems_clock_get - 09:00:18 12/31/1988 +mallocing 346 bytes +TA1 - rtems_clock_get - 09:00:18 12/31/1988 +mallocing 358 bytes +TA1 - rtems_clock_get - 09:00:18 12/31/1988 +mallocing 381 bytes +TA2 - rtems_clock_get - 09:00:18 12/31/1988 +mallocing 355 bytes +TA1 - rtems_clock_get - 09:00:18 12/31/1988 +mallocing 43 bytes +TA5 - rtems_clock_get - 09:00:18 12/31/1988 +mallocing 535 bytes +TA3 - rtems_clock_get - 09:00:18 12/31/1988 +mallocing 917 bytes +TA1 - rtems_clock_get - 09:00:18 12/31/1988 +mallocing 160 bytes +TA2 - rtems_clock_get - 09:00:19 12/31/1988 +mallocing 200 bytes +TA4 - rtems_clock_get - 09:00:19 12/31/1988 +mallocing 780 bytes +TA1 - rtems_clock_get - 09:00:19 12/31/1988 +mallocing 522 bytes +TA1 - rtems_clock_get - 09:00:19 12/31/1988 +mallocing 696 bytes +TA2 - rtems_clock_get - 09:00:19 12/31/1988 +mallocing 826 bytes +TA3 - rtems_clock_get - 09:00:19 12/31/1988 +mallocing 519 bytes +TA1 - rtems_clock_get - 09:00:19 12/31/1988 +mallocing 97 bytes +TA1 - rtems_clock_get - 09:00:19 12/31/1988 +mallocing 400 bytes +TA2 - rtems_clock_get - 09:00:20 12/31/1988 +mallocing 415 bytes +TA4 - rtems_clock_get - 09:00:20 12/31/1988 +mallocing 822 bytes +TA5 - rtems_clock_get - 09:00:20 12/31/1988 +mallocing 765 bytes +TA1 - rtems_clock_get - 09:00:20 12/31/1988 +mallocing 773 bytes +TA3 - rtems_clock_get - 09:00:20 12/31/1988 +mallocing 401 bytes +TA1 - rtems_clock_get - 09:00:20 12/31/1988 +mallocing 244 bytes +TA2 - rtems_clock_get - 09:00:20 12/31/1988 +mallocing 463 bytes +TA1 - rtems_clock_get - 09:00:20 12/31/1988 +mallocing 342 bytes +TA1 - rtems_clock_get - 09:00:20 12/31/1988 +mallocing 229 bytes +TA2 - rtems_clock_get - 09:00:21 12/31/1988 +mallocing 979 bytes +TA4 - rtems_clock_get - 09:00:21 12/31/1988 +mallocing 151 bytes +TA3 - rtems_clock_get - 09:00:21 12/31/1988 +mallocing 606 bytes +TA1 - rtems_clock_get - 09:00:21 12/31/1988 +mallocing 297 bytes +TA5 - rtems_clock_get - 09:00:21 12/31/1988 +mallocing 646 bytes +TA1 - rtems_clock_get - 09:00:21 12/31/1988 +mallocing 304 bytes +TA2 - rtems_clock_get - 09:00:21 12/31/1988 +mallocing 126 bytes +TA1 - rtems_clock_get - 09:00:21 12/31/1988 +mallocing 887 bytes +TA3 - rtems_clock_get - 09:00:21 12/31/1988 +mallocing 785 bytes +TA1 - rtems_clock_get - 09:00:21 12/31/1988 +mallocing 36 bytes +TA2 - rtems_clock_get - 09:00:22 12/31/1988 +mallocing 212 bytes +TA4 - rtems_clock_get - 09:00:22 12/31/1988 +mallocing 625 bytes +TA1 - rtems_clock_get - 09:00:22 12/31/1988 +mallocing 651 bytes +TA1 - rtems_clock_get - 09:00:22 12/31/1988 +mallocing 398 bytes +TA2 - rtems_clock_get - 09:00:22 12/31/1988 +mallocing 958 bytes +TA5 - rtems_clock_get - 09:00:22 12/31/1988 +mallocing 767 bytes +TA3 - rtems_clock_get - 09:00:22 12/31/1988 +mallocing 931 bytes +TA1 - rtems_clock_get - 09:00:22 12/31/1988 +mallocing 676 bytes +TA1 - rtems_clock_get - 09:00:22 12/31/1988 +mallocing 732 bytes +TA2 - rtems_clock_get - 09:00:23 12/31/1988 +mallocing 737 bytes +TA4 - rtems_clock_get - 09:00:23 12/31/1988 +mallocing 314 bytes +TA1 - rtems_clock_get - 09:00:23 12/31/1988 +mallocing 937 bytes +TA3 - rtems_clock_get - 09:00:23 12/31/1988 +mallocing 869 bytes +TA1 - rtems_clock_get - 09:00:23 12/31/1988 +mallocing 233 bytes +TA2 - rtems_clock_get - 09:00:23 12/31/1988 +mallocing 409 bytes +TA1 - rtems_clock_get - 09:00:23 12/31/1988 +mallocing 838 bytes +TA5 - rtems_clock_get - 09:00:23 12/31/1988 +mallocing 780 bytes +TA1 - rtems_clock_get - 09:00:23 12/31/1988 +mallocing 967 bytes +TA2 - rtems_clock_get - 09:00:24 12/31/1988 +mallocing 780 bytes +TA4 - rtems_clock_get - 09:00:24 12/31/1988 +mallocing 346 bytes +TA3 - rtems_clock_get - 09:00:24 12/31/1988 +mallocing 866 bytes +TA1 - rtems_clock_get - 09:00:24 12/31/1988 +mallocing 778 bytes +TA1 - rtems_clock_get - 09:00:24 12/31/1988 +mallocing 431 bytes +TA2 - rtems_clock_get - 09:00:24 12/31/1988 +mallocing 757 bytes +TA1 - rtems_clock_get - 09:00:24 12/31/1988 +mallocing 674 bytes +TA3 - rtems_clock_get - 09:00:24 12/31/1988 +mallocing 674 bytes +TA1 - rtems_clock_get - 09:00:24 12/31/1988 +mallocing 809 bytes +TA2 - rtems_clock_get - 09:00:25 12/31/1988 +mallocing 956 bytes +TA4 - rtems_clock_get - 09:00:25 12/31/1988 +mallocing 917 bytes +TA5 - rtems_clock_get - 09:00:25 12/31/1988 +mallocing 822 bytes +TA1 - rtems_clock_get - 09:00:25 12/31/1988 +mallocing 158 bytes +*** END OF MALLOC TEST *** diff --git a/c/src/tests/libtests/malloctest/system.h b/c/src/tests/libtests/malloctest/system.h index 3f03aa5873..c275d9ce7d 100644 --- a/c/src/tests/libtests/malloctest/system.h +++ b/c/src/tests/libtests/malloctest/system.h @@ -31,13 +31,14 @@ void blow_stack( void ); /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE*3) +#define CONFIGURE_EXTRA_TASK_STACKS ((RTEMS_MINIMUM_STACK_SIZE*2)*5) +#define CONFIGURE_MAXIMUM_TASKS 6 + #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #include <confdefs.h> diff --git a/c/src/tests/libtests/monitor/Makefile.am b/c/src/tests/libtests/monitor/Makefile.am index d73ca64e0f..2d70524319 100644 --- a/c/src/tests/libtests/monitor/Makefile.am +++ b/c/src/tests/libtests/monitor/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = monitor MANAGERS = dpmem event io msg mp part region sem signal timer rate_monotonic \ @@ -12,7 +13,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = #$(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/monitor/system.h b/c/src/tests/libtests/monitor/system.h index 52280bb9a3..a3a538f584 100644 --- a/c/src/tests/libtests/monitor/system.h +++ b/c/src/tests/libtests/monitor/system.h @@ -35,17 +35,19 @@ void Get_all_counters( void ); /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 7 +#define CONFIGURE_MAXIMUM_PERIODS 10 #define CONFIGURE_INIT_TASK_PRIORITY 10 #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_DEFAULT_MODES -#define CONFIGURE_MAXIMUM_PERIODS 10 - #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE) + +#define CONFIGURE_EXTRA_TASK_STACKS \ + (6 * (3 * RTEMS_MINIMUM_STACK_SIZE)) /* our tasks */ + \ + (1 * RTEMS_MINIMUM_STACK_SIZE) /* monitor tasks */ #include <confdefs.h> diff --git a/c/src/tests/libtests/putenvtest/Makefile.am b/c/src/tests/libtests/putenvtest/Makefile.am index 901cee10d0..a2c5d64616 100644 --- a/c/src/tests/libtests/putenvtest/Makefile.am +++ b/c/src/tests/libtests/putenvtest/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = putenvtest MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/putenvtest/init.c b/c/src/tests/libtests/putenvtest/init.c index eb19d4af80..53530db941 100644 --- a/c/src/tests/libtests/putenvtest/init.c +++ b/c/src/tests/libtests/putenvtest/init.c @@ -35,13 +35,13 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE*3) +#define CONFIGURE_MAXIMUM_TASKS 1 + #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #include <confdefs.h> diff --git a/c/src/tests/libtests/rtems++/Makefile.am b/c/src/tests/libtests/rtems++/Makefile.am index 58f6d25a40..488b04eccf 100644 --- a/c/src/tests/libtests/rtems++/Makefile.am +++ b/c/src/tests/libtests/rtems++/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = rtems++ MANAGERS = event io msg sem signal timer rate_monotonic @@ -11,7 +12,7 @@ CC_FILES = Init.cc Task1.cc Task2.cc Task3.cc CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.o) H_FILES = System.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/rtems++/System.h b/c/src/tests/libtests/rtems++/System.h index f849e53503..50d6ee13df 100644 --- a/c/src/tests/libtests/rtems++/System.h +++ b/c/src/tests/libtests/rtems++/System.h @@ -112,11 +112,10 @@ class Io_during_interrupt /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 8 #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_MAXIMUM_SEMAPHORES 2 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/libtests/rtmonuse/Makefile.am b/c/src/tests/libtests/rtmonuse/Makefile.am index 38ef675e57..7a07738196 100644 --- a/c/src/tests/libtests/rtmonuse/Makefile.am +++ b/c/src/tests/libtests/rtmonuse/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = rtmonuse MANAGERS = io rate_monotonic @@ -11,7 +12,7 @@ C_FILES = init.c getall.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/rtmonuse/system.h b/c/src/tests/libtests/rtmonuse/system.h index 9d92d23d14..e9d1a559de 100644 --- a/c/src/tests/libtests/rtmonuse/system.h +++ b/c/src/tests/libtests/rtmonuse/system.h @@ -35,14 +35,14 @@ void Get_all_counters( void ); /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 6 +#define CONFIGURE_MAXIMUM_PERIODS 10 #define CONFIGURE_INIT_TASK_PRIORITY 10 #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_DEFAULT_MODES -#define CONFIGURE_MAXIMUM_PERIODS 10 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/libtests/stackchk/Makefile.am b/c/src/tests/libtests/stackchk/Makefile.am index de59857ea3..80ef6963bb 100644 --- a/c/src/tests/libtests/stackchk/Makefile.am +++ b/c/src/tests/libtests/stackchk/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = stackchk MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = blow.c init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/stackchk/system.h b/c/src/tests/libtests/stackchk/system.h index 4c43388163..42f0166a3e 100644 --- a/c/src/tests/libtests/stackchk/system.h +++ b/c/src/tests/libtests/stackchk/system.h @@ -17,8 +17,6 @@ /* macros */ -#define TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE*3) - /* functions */ rtems_task Init( @@ -33,10 +31,13 @@ void blow_stack( void ); /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE*3) -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 4 +#define CONFIGURE_EXTRA_TASK_STACKS (3 * (RTEMS_MINIMUM_STACK_SIZE * 2)) #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/libtests/termios/Makefile.am b/c/src/tests/libtests/termios/Makefile.am index 455730ee90..01f333be06 100644 --- a/c/src/tests/libtests/termios/Makefile.am +++ b/c/src/tests/libtests/termios/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = termios MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/termios/README b/c/src/tests/libtests/termios/README index 6991d80309..2515b2994f 100644 --- a/c/src/tests/libtests/termios/README +++ b/c/src/tests/libtests/termios/README @@ -4,6 +4,53 @@ These tests are brought to you by the letter `q'. +When you start the test, you should see: + + You have the following choices: + 1 - Reset the struct termios + 2 - Look at the current termios setting + 3 - Change the line characteristics + 4 - Test canonical input + 5 - Test raw input + 9 - Exit + Enter your choice (1 to 5 or 9, followed by a carriage return): + +The individual tests are briefly described below: + + +1. Reset the struct termios. + +Included just in case you get into trouble. More than likely, if you are in +trouble, neither input nor output are likely to work and this won't help. But +hey, it should give you some warm fuzzy feeling that its there... + + +2. Look at the current termios setting + +Dumps the current state of the termios settings in hex and with symbolic flag +names. + + +3. Change the line characteristics + +Allows you to change the line speed, parity, number of data bits and number of +stop bits. You must supply a delay before the change takes effect. This gives +you time to switch your terminal settings to continue with the test. + +WARNING: Minicom under Linux gets extremely unhappy (as does the /dev/ttyS? +underlying devices) if you change the line characteristics and do not make the +corresponding change in the terminal emulator. + + +4. Test canonical input + +Simple test of canonical or cooked input mode. Try typing some tabs and/or control characters and make sure that you can backspace over them properly. + + +5. Test raw input + +The line is placed into raw mode and four separate test are done: + VMIN=0, VTIME=0 Each letter you type should produce a line of output. The `count' should be quite large, since (as you correctly @@ -23,18 +70,19 @@ VMIN=5, VTIME=0 the test. VMIN=5, VTIME=20 Type a character. Two seconds later a line should be printed. - Count should be 1. Type a character, and another within 2 -seconds. - Two seconds after last character (or right after the 5th -character) + Count should be 1. Type a character, and another within 2 seconds. + Two seconds after last character (or right after the 5th character) a line should be printed. Type a `q' as the first character of a group to finish the test. - + + +9. Exit + +Gets you out of the test. + + Clear??? -Also, when testing the cooked mode input, try typing some tabs -and/or control characters and make sure that you can backspace over -them properly. --- Eric Norum @@ -43,3 +91,9 @@ Saskatchewan Accelerator Laboratory University of Saskatchewan Saskatoon, Canada. +Charles-Antoine Gauthier +Software Engineering Group +Institute for Information Technology +National Research Council of Canada +charles.gauthier@nrc.ca + diff --git a/c/src/tests/libtests/termios/init.c b/c/src/tests/libtests/termios/init.c index 067b82ac07..bc4097a8cc 100644 --- a/c/src/tests/libtests/termios/init.c +++ b/c/src/tests/libtests/termios/init.c @@ -3,34 +3,38 @@ * * This program may be distributed and used for any purpose. * I ask only that you: - * 1. Leave this author information intact. - * 2. Document any changes you make. + * 1. Leave this author information intact. + * 2. Document any changes you make. * * W. Eric Norum * Saskatchewan Accelerator Laboratory * University of Saskatchewan * Saskatoon, Saskatchewan, CANADA * eric@skatter.usask.ca + * + * Additions: + * Charles-Antoine Gauthier + * Software Engineering Group + * Institute for Information Technology + * National Research Council of Canada + * charles.gauthier@nrc.ca * * $Id$ */ #include <bsp.h> -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_RTEMS_INIT_TASKS_TABLE +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_MAXIMUM_SEMAPHORES 20 -#define CONFIGURE_MAXIMUM_TIMERS 5 -#define CONFIGURE_MAXIMUM_PERIODS 1 - -#define CONFIGURE_MICROSECONDS_PER_TICK 1000 +#define CONFIGURE_MICROSECONDS_PER_TICK 1000 #define CONFIGURE_INIT + rtems_task Init (rtems_task_argument argument); #include <confdefs.h> @@ -41,105 +45,724 @@ rtems_task Init (rtems_task_argument argument); #include <errno.h> #include <string.h> +#if !defined(fileno) int fileno( FILE *stream); /* beyond ANSI */ +#endif + +/* Some of the termios dumping code depends on bit positions! */ + +void print_32bits( unsigned long bits, unsigned char size, char * names[] ) +{ + unsigned char i; + + for( i = 0; i < size; i++ ) { + if( (bits >> i) & 0x1 ) + printf( "%s ", names[i] ); + } +} + + +void print_c_iflag( struct termios * tp ) +{ + char * c_iflag_bits [] = { + "IGNBRK", /* 0000001 */ + "BRKINT", /* 0000002 */ + "IGNPAR", /* 0000004 */ + "PARMRK", /* 0000010 */ + "INPCK", /* 0000020 */ + "ISTRIP", /* 0000040 */ + "INLCR", /* 0000100 */ + "IGNCR", /* 0000200 */ + "ICRNL", /* 0000400 */ + "IUCLC", /* 0001000 */ + "IXON", /* 0002000 */ + "IXANY", /* 0004000 */ + "IXOFF", /* 0010000 */ + "IMAXBEL", /* 0020000 */ + "unknown", /* 0040000 */ + "unknown", /* 0100000 */ + "unknown", /* 0200000 */ + "unknown", /* 0400000 */ + "unknown", /* 1000000 */ + "unknown", /* 2000000 */ + "unknown" /* 4000000 */ + }; + + printf( "c_iflag = 0x%08x\n\t", tp->c_iflag ); + print_32bits( tp->c_iflag, sizeof( c_iflag_bits )/sizeof( char * ), c_iflag_bits ); + printf( "\n" ); +} + + +void print_c_oflag( struct termios * tp ) +{ + printf( "c_oflag = 0x%08x\n\t", tp->c_oflag ); + + if( tp->c_oflag & OPOST ) + printf( "OPOST " ); + + if( tp->c_oflag & OLCUC ) + printf( "OLCUC " ); + + if( tp->c_oflag & ONLCR ) + printf( "ONLCR " ); + + if( tp->c_oflag & OCRNL ) + printf( "OCRNL " ); + + if( tp->c_oflag & ONOCR ) + printf( "ONOCR " ); + + if( tp->c_oflag & ONLRET ) + printf( "ONLRET " ); + + if( tp->c_oflag & OFILL ) + printf( "OFILL " ); + + if( tp->c_oflag & OFDEL ) + printf( "OFDEL " ); + + switch( tp->c_oflag & NLDLY ) { + case NL0: + printf( "NL0 " ); + break; + + case NL1: + printf( "NL1 " ); + break; + } + + switch( tp->c_oflag & CRDLY ) { + case CR0: + printf( "CR0 " ); + break; + + case CR1: + printf( "CR1 " ); + break; + + case CR2: + printf( "CR2 " ); + break; + + case CR3: + printf( "CR3 " ); + break; + } + + switch( tp->c_oflag & TABDLY ) { + case TAB0: + printf( "TAB0 " ); + break; + + case TAB1: + printf( "TAB1 " ); + break; + + case TAB2: + printf( "TAB2 " ); + break; + + case TAB3: + printf( "TAB3 " ); + break; + } + + switch( tp->c_oflag & BSDLY ) { + case BS0: + printf( "BS0 " ); + break; + + case BS1: + printf( "BS1 " ); + break; + } + + switch( tp->c_oflag & VTDLY ) { + case VT0: + printf( "VT0 " ); + break; + + case VT1: + printf( "VT1 " ); + break; + } + + switch( tp->c_oflag & FFDLY ) { + case FF0: + printf( "FF0" ); + break; + + case FF1: + printf( "FF1" ); + break; + } + printf( "\n" ); +} + + +void print_c_lflag( struct termios * tp ) +{ + char * c_lflag_bits [] = { + "ISIG", /* 0000001 */ + "ICANON", /* 0000002 */ + "XCASE", /* 0000004 */ + "ECHO", /* 0000010 */ + "ECHOE", /* 0000020 */ + "ECHOK", /* 0000040 */ + "ECHONL", /* 0000100 */ + "NOFLSH", /* 0000200 */ + "TOSTOP", /* 0000400 */ + "ECHOCTL", /* 0001000 */ + "ECHOPRT", /* 0002000 */ + "ECHOKE", /* 0004000 */ + "FLUSHO", /* 0010000 */ + "unknown", /* 0020000 */ + "PENDIN", /* 0040000 */ + "IEXTEN", /* 0100000 */ + "unknown", /* 0200000 */ + "unknown", /* 0400000 */ + "unknown", /* 1000000 */ + "unknown", /* 2000000 */ + "unknown", /* 4000000 */ + }; + + printf( "c_lflag = 0x%08x\n\t", tp->c_lflag ); + print_32bits( tp->c_lflag, sizeof( c_lflag_bits )/sizeof( char * ), c_lflag_bits ); + printf( "\n" ); +} + + +void print_c_cflag( struct termios * tp ) +{ + int baud; + + printf( "c_cflag = 0x%08x\n", tp->c_cflag ); + + switch( baud = (tp->c_cflag & CBAUD) ) { + case B0: + printf( "\tCBAUD =\tB0\n" ); + break; + + case B50: + printf( "\tCBAUD =\tB50\n" ); + break; + + case B75: + printf( "\tCBAUD =\tB75\n" ); + break; + + case B110: + printf( "\tCBAUD =\tB110\n" ); + break; + + case B134: + printf( "\tCBAUD =\tB134\n" ); + break; + + case B150: + printf( "\tCBAUD =\tB150\n" ); + break; + + case B200: + printf( "\tCBAUD =\tB200\n" ); + break; + + case B300: + printf( "\tCBAUD =\tB300\n" ); + break; + + case B600: + printf( "\tCBAUD =\tB600\n" ); + break; + + case B1200: + printf( "\tCBAUD =\tB1200\n" ); + break; + + case B1800: + printf( "\tCBAUD =\tB1800\n" ); + break; + + case B2400: + printf( "\tCBAUD =\tB2400\n" ); + break; + + case B4800: + printf( "\tCBAUD =\tB4800\n" ); + break; + + case B9600: + printf( "\tCBAUD =\tB9600\n" ); + break; + + case B19200: + printf( "\tCBAUD =\tB19200\n" ); + break; + + case B38400: + printf( "\tCBAUD =\tB38400\n" ); + break; + + case B57600: + printf( "\tCBAUD =\tB57600\n" ); + break; + + case B115200: + printf( "\tCBAUD =\tB115200\n" ); + break; + + case B230400: + printf( "\tCBAUD =\tB230400\n" ); + break; + + case B460800: + printf( "\tCBAUD =\tB460800\n" ); + break; + + default: + printf( "\tCBAUD =\tunknown (0x%08x)\n", baud ); + break; + } + + switch( tp->c_cflag & CSIZE ) { + case CS5: + printf( "\tCSIZE =\tCS5\n" ); + break; + + case CS6: + printf( "\tCSIZE =\tCS6\n" ); + break; + + case CS7: + printf( "\tCSIZE =\tCS7\n" ); + break; + + case CS8: + printf( "\tCSIZE =\tCS8\n" ); + break; + } + + if( tp->c_cflag & CSTOPB ) + printf( "\tCSTOPB set: send 2 stop bits\n" ); + else + printf( "\tCSTOPB clear: send 1 stop bit\n" ); + + if( tp->c_cflag & PARENB ) + printf( "\tPARENB set: parity enabled\n" ); + else + printf( "\tPARENB clear: parity disabled\n" ); + + if( tp->c_cflag & PARODD ) + printf( "\tPARODD set: parity odd\n" ); + else + printf( "\tPARODD clear: parity even\n" ); + + if( tp->c_cflag & CREAD ) + printf( "\tCREAD set: receiver enabled\n" ); + else + printf( "\tCREAD clear: treceiver disabled\n" ); + + if( tp->c_cflag & HUPCL ) + printf( "\tHUPCL set: enabled\n" ); + else + printf( "\tHUPCL clear: disabled\n" ); + + if( tp->c_cflag & CLOCAL ) + printf( "\tCLOCAL set: ignore modem lines\n" ); + else + printf( "\tCLOCAL clear: don't ignore modem lines\n" ); + +#if defined(CBAUDEX) + if( tp->c_cflag & CBAUDEX ) + printf( "\tCBAUDEX set: What does this do?\n" ); + else + printf( "\tCBAUDEX clear: What does this do?\n" ); +#endif + + if( tp->c_cflag & CRTSCTS ) + printf( "\tCRTSCTS: harware flow control enabled?\n" ); + else + printf( "\tCRTSCTS: hardware flow control disabled?\n" ); +} + + +void print_c_cc( struct termios * tp ) +{ + int i; + char * cc_index_names [NCCS] = { + "[VINTR] ", /* 0 */ + "[VQUIT] ", /* 1 */ + "[VERASE] ", /* 2 */ + "[VKILL] ", /* 3 */ + "[VEOF] ", /* 4 */ + "[VTIME] ", /* 5 */ + "[VMIN] ", /* 6 */ + "[VSWTC ", /* 7 */ + "[VSTART] ", /* 8 */ + "[VSTOP] ", /* 9 */ + "[VSUSP] ", /* 10 */ + "[VEOL] ", /* 11 */ + "[VREPRINT]", /* 12 */ + "[VDISCARD]", /* 13 */ + "[VWERASE] ", /* 14 */ + "[VLNEXT ", /* 15 */ + "[VEOL2] ", /* 16 */ + "unknown ", /* 17 */ + "unknown ", /* 18 */ + }; + + for( i = 0; i < NCCS; i++ ) { + printf( "c_cc%s = 0x%08x\n", cc_index_names[i], tp->c_cc[i] ); + } +} + + +void print_termios( struct termios *tp ) +{ + printf( "\nLooking at the current termios settings:\n\n" ); + print_c_iflag( tp ); + print_c_oflag( tp ); + print_c_cflag( tp ); + print_c_lflag( tp ); + print_c_cc( tp ); + printf( "\n" ); +} + + +unsigned long get_baud_rate( void ) +{ + unsigned long baud_rate; + + while( TRUE ) { + printf( "Enter the numerical value for the new baud rate.\n" ); + printf( "Choices are: 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800\n" ); + printf( "2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400, 460800\n" ); + printf( "\nYour choice: " ); + scanf( "%lu", &baud_rate ); + printf( "\n" ); + switch( baud_rate ) { + case 50: return B50; + case 75: return B75; + case 110: return B110; + case 134: return B134; + case 150: return B150; + case 200: return B200; + case 300: return B300; + case 600: return B600; + case 1200: return B1200; + case 1800: return B1800; + case 2400: return B2400; + case 4800: return B4800; + case 9600: return B9600; + case 19200: return B19200; + case 38400: return B38400; + case 57600: return B57600; + case 115200: return B115200; + case 230400: return B230400; + case 460800: return B460800; + + default: + printf( "%lu is not a valid choice. Try again.\n\n", baud_rate ); + break; + } + } +} + + +unsigned long get_parity() +{ + int parity; + + while( TRUE ) { + printf( "Enter the numerical value for the new parity\n" ); + printf( "Choices are: 0 for no parity, 1 for even parity, 2 for odd parity\n" ); + printf( "\nYour choice: " ); + scanf( "%d", &parity ); + printf( "\n" ); + switch( parity ) { + case 0: + return 0; + + case 1: + return PARENB; + + case 2: + return PARENB | PARODD; + + default: + printf( "%d is not a valid choice. Try again.\n\n", parity ); + break; + } + } +} + + +unsigned long get_stop_bits() +{ + int stop_bits; + + while( TRUE ) { + printf( "Enter the numerical value for the new number of stop bits\n" ); + printf( "Choices are: 1 or 2\n" ); + printf( "\nYour choice: " ); + scanf( "%d", &stop_bits ); + printf( "\n" ); + switch( stop_bits ) { + case 1: + return 0; + + case 2: + return CSTOPB; + + default: + printf( "%d is not a valid choice. Try again.\n\n", stop_bits ); + break; + } + } +} + + +unsigned long get_data_bits() +{ + int data_bits; + + while( TRUE ) { + printf( "Enter the numerical value for the new number of data bits\n" ); + printf( "Choices are: 5, 6, 7 or 8\n" ); + printf( "\nYour choice: " ); + scanf( "%d", &data_bits ); + printf( "\n" ); + switch( data_bits ) { + case 5: + return CS5; + + case 6: + return CS6; + + case 7: + return CS7; + + case 8: + return CS8; + + default: + printf( "%d is not a valid choice. Try again.\n\n", data_bits ); + break; + } + } +} + + +void change_line_settings( struct termios *tp ) +{ + unsigned long baud_rate, parity, stop_bits, data_bits, sleep_time; + + printf( "\nSetting line characteristics\n\n" ); + + baud_rate = get_baud_rate(); + parity = get_parity(); + stop_bits = get_stop_bits(); + data_bits = get_data_bits(); + + printf( "NOTE: You will not see output until you switch your terminal settings!\n" ); + printf( "WARNING: If you do not switch your terminal settings, your terminal may hang.\n" ); + printf( "Enter the number of seconds the test will wait for you to switch your terminal\n" ); + printf( "settings before it continues\n" ); + printf( "Sleep time (in seconds): " ); + scanf( "%lu", &sleep_time ); + printf( "\n" ); + printf( "Setting line to new termios settings in %lu seconds.\n", sleep_time ); + + sleep( sleep_time ); + + tp->c_cflag = CLOCAL | CREAD | parity | stop_bits | data_bits | baud_rate; + if( tcsetattr( fileno( stdin ), TCSADRAIN, tp ) < 0 ) { + perror( "change_line_settings(): tcsetattr() failed" ); + exit( 1 ); + } + printf( "Line settings set.\n" ); +} + + +void canonical_input( struct termios *tp ) +{ + char c, first_time = TRUE; + + printf( "\nTesting canonical input\n\n" ); + + printf( "Setting line to canonical input mode.\n" ); + tp->c_lflag = ISIG | ICANON | ECHO | ECHONL | ECHOK | ECHOE | ECHOPRT | ECHOCTL | IEXTEN; + tp->c_iflag = BRKINT | ICRNL | IXON | IMAXBEL; + if( tcsetattr( fileno( stdin ), TCSADRAIN, tp ) < 0 ) { + perror( "canonical_input(): tcsetattr() failed" ); + exit( 1 ); + } + + while ( ( c = getchar () ) != '\n'); + printf( "Testing getchar(). Type some text followed by carriage return\n" ); + printf( "Each character you entered will be echoed back to you\n\n" ); + while ( ( c = getchar () ) != '\n') { + if( first_time ) { + printf( "\nYou typed:\n"); + first_time = FALSE; + } + printf( "%c", c ); + } + printf( "\n\nCanonical input test done.\n" ); +} /* * Test raw (ICANON=0) input */ -static void -testRawInput (int vmin, int vtime) -{ - int i; - struct termios old, new; - rtems_interval ticksPerSecond, then, now; - unsigned int msec; - unsigned long count; - int nread; - unsigned char cbuf[100]; - - printf ("*** Raw input VMIN=%d VTIME=%d ***\n", vmin, vtime); - rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond); - i = tcgetattr (fileno (stdin), &old); - if (i < 0) { - printf ("tcgetattr failed: %s\n", strerror (errno)); - return; - } - new = old; - new.c_lflag &= ~(ICANON|ECHO|ECHONL|ECHOK|ECHOE|ECHOPRT|ECHOCTL); - new.c_cc[VMIN] = vmin; - new.c_cc[VTIME] = vtime; - i = tcsetattr (fileno (stdin), TCSANOW, &new); - if (i < 0) { - printf ("tcsetattr failed: %s\n", strerror (errno)); - return; - } - do { - rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then); - count = 0; - for (;;) { - nread = read (fileno (stdin), cbuf, sizeof cbuf); - if (nread < 0) { - printf ("Read error: %s\n", strerror (errno)); - goto out; - } - count++; - if (nread != 0) - break; - } - rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now); - msec = (now - then) * 1000 / ticksPerSecond; - printf ("Count:%-10lu Interval:%3u.%3.3d Char:", - count, msec / 1000, msec % 1000); - for (i = 0 ; i < nread ; i++) - printf (" %2.2x", cbuf[i]); - printf ("\n"); - } while (cbuf[0] != 'q'); - out: - i = tcsetattr (fileno (stdin), TCSANOW, &old); - if (i < 0) - printf ("tcsetattr failed: %s\n", strerror (errno)); - printf ("*** End of Raw input VMIN=%d VTIME=%d ***\n", vmin, vtime); +void do_raw_input( int vmin, int vtime ) +{ + int i; + struct termios old, new; + rtems_interval ticksPerSecond, then, now; + unsigned int msec; + unsigned long count; + int nread; + unsigned char cbuf[100]; + + printf( "Raw input test with VMIN=%d VTIME=%d\n", vmin, vtime ); + + rtems_clock_get( RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond ); + if ( tcgetattr( fileno ( stdin ), &old ) < 0 ) { + perror( "do_raw_input(): tcgetattr() failed" ); + return; + } + + new = old; + new.c_lflag &= ~( ICANON | ECHO | ECHONL | ECHOK | ECHOE | ECHOPRT | ECHOCTL ); + new.c_cc[VMIN] = vmin; + new.c_cc[VTIME] = vtime; + if( tcsetattr( fileno( stdin ), TCSADRAIN, &new ) < 0 ) { + perror ("do_raw_input(): tcsetattr() failed" ); + return; + } + + do { + rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then ); + count = 0; + for(;;) { + nread = read( fileno( stdin ), cbuf, sizeof cbuf ); + if( nread < 0 ) { + perror( "do_raw_input(): read() failed" ); + goto out; + } + count++; + if( nread != 0 ) + break; + } + rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now ); + msec = (now - then) * 1000 / ticksPerSecond; + printf( "Count:%-10lu Interval:%3u.%3.3d Char:", + count, msec / 1000, msec % 1000 ); + + for( i = 0 ; i < nread ; i++ ) + printf (" 0x%2.2x", cbuf[i]); + printf ("\n"); + + } while( cbuf[0] != 'q' ); + +out: + if( tcsetattr( fileno( stdin ), TCSADRAIN, &old) < 0 ) + perror("do_raw_input(): tcsetattr() failed: %s\n" ); + + printf ("*** End of Raw input VMIN=%d VTIME=%d ***\n", vmin, vtime); +} + + +void raw_input( struct termios *tp ) +{ + printf( "\nTesting raw input input\n\n" ); + printf( "Hit 'q' to terminate the test\n" ); + + do_raw_input( 0, 0 ); + do_raw_input( 0, 20 ); + do_raw_input( 5, 0 ); + do_raw_input( 5, 20 ); + + printf( "\nRaw input test done.\n" ); +} + + +void usage( void ) +{ + printf( "\nYou have the following choices:\n" ); + printf( " 1 - Reset the struct termios\n" ); + printf( " 2 - Look at the current termios setting\n" ); + printf( " 3 - Change the line characteristics\n" ); + printf( " 4 - Test canonical input\n" ); + printf( " 5 - Test raw input\n" ); + printf( " 9 - Exit\n" ); + printf( "Enter your choice (1 to 5 or 9, followed by a carriage return): " ); } + /* * RTEMS Startup Task */ rtems_task Init (rtems_task_argument ignored) { - int i, j; - - printf( "\n\n*** HELLO WORLD TEST ***\n" ); - printf( "Hello World\n" ); - printf( "*** END OF HELLO WORLD TEST ***\n" ); - - printf( "\n\ntype 'q' to exit raw input tests\n\n" ); - - for (;;) { - /* - * Test blocking, line-oriented input - */ - do { - printf (">>> "); - fflush (stdout); - i = scanf (" %d", &j); - printf ("Return: %d Value: %d\n", i, j); - } while (i != 0); - - /* - * Consume what scanf rejected - */ - while ((i = getchar ()) != '\n') - if (i == EOF) - break; - - /* - * Test character-oriented input - */ - testRawInput (0, 0); - testRawInput (0, 20); - testRawInput (5, 0); - testRawInput (5, 20); - } - exit (1); + char c; + struct termios orig_termios, test_termios; + + printf( "\n\n*** TEST OF TERMIOS INPUT CAPABILITIES ***\n" ); + + if( tcgetattr( fileno( stdin ), &orig_termios ) < 0 ) { + perror( "tcgetattr() failed" ); + exit( 0 ); + } + + test_termios = orig_termios; + + usage(); + for(;;) { + switch( c = getchar() ) { + case '1': + printf( "\nResetting the line to the original termios setting\n\n" ); + test_termios = orig_termios; + if( tcsetattr( fileno( stdin ), TCSADRAIN, &test_termios ) < 0 ) { + perror( "tcsetattr() failed" ); + exit( 1 ); + } + usage(); + break; + + case '2': + print_termios( &test_termios ); + usage(); + break; + + case '3': + change_line_settings( &test_termios ); + usage(); + break; + + case '4': + canonical_input( &test_termios ); + usage(); + break; + + case '5': + raw_input( &test_termios ); + usage(); + break; + + case '9': + exit( 1 ); + + case '\n': + break; + + default: + printf( "\n%c is not a valid choice. Try again\n\n", c ); + usage(); + break; + } + } } + diff --git a/c/src/tests/mptests/mp01/node1/Makefile.am b/c/src/tests/mptests/mp01/node1/Makefile.am index 36d8d0dfb4..fcddeccc68 100644 --- a/c/src/tests/mptests/mp01/node1/Makefile.am +++ b/c/src/tests/mptests/mp01/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp01/node2/Makefile.am b/c/src/tests/mptests/mp01/node2/Makefile.am index 0a80134c68..23a4b86a14 100644 --- a/c/src/tests/mptests/mp01/node2/Makefile.am +++ b/c/src/tests/mptests/mp01/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp01/system.h b/c/src/tests/mptests/mp01/system.h index c1ce67d249..c4f9ac18b2 100644 --- a/c/src/tests/mptests/mp01/system.h +++ b/c/src/tests/mptests/mp01/system.h @@ -27,13 +27,15 @@ rtems_task Test_task( /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_RTEMS_INIT_TASKS_TABLE +#define CONFIGURE_MAXIMUM_TASKS 4 + #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_GLOBAL +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #include <confdefs.h> diff --git a/c/src/tests/mptests/mp02/node1/Makefile.am b/c/src/tests/mptests/mp02/node1/Makefile.am index 4f1f920303..0644447874 100644 --- a/c/src/tests/mptests/mp02/node1/Makefile.am +++ b/c/src/tests/mptests/mp02/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp02/node2/Makefile.am b/c/src/tests/mptests/mp02/node2/Makefile.am index 9887d04d42..570db75ea2 100644 --- a/c/src/tests/mptests/mp02/node2/Makefile.am +++ b/c/src/tests/mptests/mp02/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp02/system.h b/c/src/tests/mptests/mp02/system.h index af065a5e67..c3a31ce812 100644 --- a/c/src/tests/mptests/mp02/system.h +++ b/c/src/tests/mptests/mp02/system.h @@ -27,10 +27,12 @@ rtems_task Test_task( /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/mptests/mp03/node1/Makefile.am b/c/src/tests/mptests/mp03/node1/Makefile.am index 94e3c5d068..02ab109ef2 100644 --- a/c/src/tests/mptests/mp03/node1/Makefile.am +++ b/c/src/tests/mptests/mp03/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp03/node2/Makefile.am b/c/src/tests/mptests/mp03/node2/Makefile.am index 08acad9391..9ec135eac0 100644 --- a/c/src/tests/mptests/mp03/node2/Makefile.am +++ b/c/src/tests/mptests/mp03/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp03/system.h b/c/src/tests/mptests/mp03/system.h index c2c27f3196..5d0636bd63 100644 --- a/c/src/tests/mptests/mp03/system.h +++ b/c/src/tests/mptests/mp03/system.h @@ -32,11 +32,12 @@ rtems_timer_service_routine Delayed_send_event( /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/mptests/mp04/node1/Makefile.am b/c/src/tests/mptests/mp04/node1/Makefile.am index 20201ccb6a..f1c48a32dd 100644 --- a/c/src/tests/mptests/mp04/node1/Makefile.am +++ b/c/src/tests/mptests/mp04/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp04/node2/Makefile.am b/c/src/tests/mptests/mp04/node2/Makefile.am index a3a537743a..601919f21f 100644 --- a/c/src/tests/mptests/mp04/node2/Makefile.am +++ b/c/src/tests/mptests/mp04/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp04/system.h b/c/src/tests/mptests/mp04/system.h index 0b343c86a3..ab91566559 100644 --- a/c/src/tests/mptests/mp04/system.h +++ b/c/src/tests/mptests/mp04/system.h @@ -27,11 +27,12 @@ rtems_task Test_task( /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/mptests/mp05/node1/Makefile.am b/c/src/tests/mptests/mp05/node1/Makefile.am index 7de770e601..a53e9b2c06 100644 --- a/c/src/tests/mptests/mp05/node1/Makefile.am +++ b/c/src/tests/mptests/mp05/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp05/node2/Makefile.am b/c/src/tests/mptests/mp05/node2/Makefile.am index 3bb698dd47..b27b2b81db 100644 --- a/c/src/tests/mptests/mp05/node2/Makefile.am +++ b/c/src/tests/mptests/mp05/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp05/system.h b/c/src/tests/mptests/mp05/system.h index a5ec04e368..e19f049fab 100644 --- a/c/src/tests/mptests/mp05/system.h +++ b/c/src/tests/mptests/mp05/system.h @@ -29,11 +29,12 @@ rtems_asr Process_asr( rtems_signal_set ); /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/mptests/mp06/node1/Makefile.am b/c/src/tests/mptests/mp06/node1/Makefile.am index ab7c67d1c1..c0394c36ca 100644 --- a/c/src/tests/mptests/mp06/node1/Makefile.am +++ b/c/src/tests/mptests/mp06/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp06/node2/Makefile.am b/c/src/tests/mptests/mp06/node2/Makefile.am index 08ce32ea8b..dc2c865598 100644 --- a/c/src/tests/mptests/mp06/node2/Makefile.am +++ b/c/src/tests/mptests/mp06/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp06/system.h b/c/src/tests/mptests/mp06/system.h index 2062710560..7a38afcfcb 100644 --- a/c/src/tests/mptests/mp06/system.h +++ b/c/src/tests/mptests/mp06/system.h @@ -27,11 +27,12 @@ rtems_task Test_task( /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/mptests/mp07/node1/Makefile.am b/c/src/tests/mptests/mp07/node1/Makefile.am index c83109eedc..fd03da42a8 100644 --- a/c/src/tests/mptests/mp07/node1/Makefile.am +++ b/c/src/tests/mptests/mp07/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp07/node2/Makefile.am b/c/src/tests/mptests/mp07/node2/Makefile.am index 2a6e01a60f..c6d4173459 100644 --- a/c/src/tests/mptests/mp07/node2/Makefile.am +++ b/c/src/tests/mptests/mp07/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp07/system.h b/c/src/tests/mptests/mp07/system.h index 2062710560..7a38afcfcb 100644 --- a/c/src/tests/mptests/mp07/system.h +++ b/c/src/tests/mptests/mp07/system.h @@ -27,11 +27,12 @@ rtems_task Test_task( /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/mptests/mp08/node1/Makefile.am b/c/src/tests/mptests/mp08/node1/Makefile.am index 1af1d8c753..34331f026e 100644 --- a/c/src/tests/mptests/mp08/node1/Makefile.am +++ b/c/src/tests/mptests/mp08/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp08/node2/Makefile.am b/c/src/tests/mptests/mp08/node2/Makefile.am index 10494437e2..dea01f6853 100644 --- a/c/src/tests/mptests/mp08/node2/Makefile.am +++ b/c/src/tests/mptests/mp08/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp08/system.h b/c/src/tests/mptests/mp08/system.h index 925a2e1ed8..1bfc0d1ae1 100644 --- a/c/src/tests/mptests/mp08/system.h +++ b/c/src/tests/mptests/mp08/system.h @@ -27,11 +27,12 @@ rtems_task Test_task( /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_MAXIMUM_SEMAPHORES 1 diff --git a/c/src/tests/mptests/mp09/node1/Makefile.am b/c/src/tests/mptests/mp09/node1/Makefile.am index 01998048c8..aaea270e37 100644 --- a/c/src/tests/mptests/mp09/node1/Makefile.am +++ b/c/src/tests/mptests/mp09/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp09/node2/Makefile.am b/c/src/tests/mptests/mp09/node2/Makefile.am index ea8d3b2fc5..c9eccac036 100644 --- a/c/src/tests/mptests/mp09/node2/Makefile.am +++ b/c/src/tests/mptests/mp09/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp09/system.h b/c/src/tests/mptests/mp09/system.h index 66eed7f097..1b3d425325 100644 --- a/c/src/tests/mptests/mp09/system.h +++ b/c/src/tests/mptests/mp09/system.h @@ -31,11 +31,12 @@ void Send_messages( void ); /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/mptests/mp10/node1/Makefile.am b/c/src/tests/mptests/mp10/node1/Makefile.am index 15c3130981..7281b77bcf 100644 --- a/c/src/tests/mptests/mp10/node1/Makefile.am +++ b/c/src/tests/mptests/mp10/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp10/node2/Makefile.am b/c/src/tests/mptests/mp10/node2/Makefile.am index 9631817320..8750e465dc 100644 --- a/c/src/tests/mptests/mp10/node2/Makefile.am +++ b/c/src/tests/mptests/mp10/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp10/system.h b/c/src/tests/mptests/mp10/system.h index d41dd4c8e4..e101987446 100644 --- a/c/src/tests/mptests/mp10/system.h +++ b/c/src/tests/mptests/mp10/system.h @@ -35,14 +35,17 @@ rtems_task Test_task3( /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #if ( NODE_NUMBER == 1 ) +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 +#else +#define CONFIGURE_MAXIMUM_TASKS 4 #endif #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/mptests/mp11/node1/Makefile.am b/c/src/tests/mptests/mp11/node1/Makefile.am index 903abd0c45..f86c54c1b7 100644 --- a/c/src/tests/mptests/mp11/node1/Makefile.am +++ b/c/src/tests/mptests/mp11/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp11/node2/Makefile.am b/c/src/tests/mptests/mp11/node2/Makefile.am index c3f94096b4..35f2608e54 100644 --- a/c/src/tests/mptests/mp11/node2/Makefile.am +++ b/c/src/tests/mptests/mp11/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp11/system.h b/c/src/tests/mptests/mp11/system.h index db553e813f..68bbe83f3b 100644 --- a/c/src/tests/mptests/mp11/system.h +++ b/c/src/tests/mptests/mp11/system.h @@ -23,14 +23,15 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS 0 #define CONFIGURE_MP_MAXIMUM_PROXIES 0 +#define CONFIGURE_MAXIMUM_TASKS 1 #if ( NODE_NUMBER == 1 ) #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/mptests/mp12/node1/Makefile.am b/c/src/tests/mptests/mp12/node1/Makefile.am index 4c634741b1..9e3e61c6a4 100644 --- a/c/src/tests/mptests/mp12/node1/Makefile.am +++ b/c/src/tests/mptests/mp12/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp12/node2/Makefile.am b/c/src/tests/mptests/mp12/node2/Makefile.am index dfdabec2e1..e860040919 100644 --- a/c/src/tests/mptests/mp12/node2/Makefile.am +++ b/c/src/tests/mptests/mp12/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp12/system.h b/c/src/tests/mptests/mp12/system.h index b464f17f1c..a9f7f11dd8 100644 --- a/c/src/tests/mptests/mp12/system.h +++ b/c/src/tests/mptests/mp12/system.h @@ -25,14 +25,15 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS 1 #define CONFIGURE_MP_MAXIMUM_PROXIES 0 +#define CONFIGURE_MAXIMUM_TASKS 1 #if ( NODE_NUMBER == 1 ) #define CONFIGURE_MAXIMUM_PARTITIONS 1 #elif ( NODE_NUMBER == 2 ) diff --git a/c/src/tests/mptests/mp13/node1/Makefile.am b/c/src/tests/mptests/mp13/node1/Makefile.am index fe34c6f673..cfd2fa1a46 100644 --- a/c/src/tests/mptests/mp13/node1/Makefile.am +++ b/c/src/tests/mptests/mp13/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp13/node2/Makefile.am b/c/src/tests/mptests/mp13/node2/Makefile.am index d19b736e51..5be99378aa 100644 --- a/c/src/tests/mptests/mp13/node2/Makefile.am +++ b/c/src/tests/mptests/mp13/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp13/system.h b/c/src/tests/mptests/mp13/system.h index 08e0ef2152..0f917d5598 100644 --- a/c/src/tests/mptests/mp13/system.h +++ b/c/src/tests/mptests/mp13/system.h @@ -31,11 +31,12 @@ rtems_task Test_task2( /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #if ( NODE_NUMBER == 1 ) #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/mptests/mp14/Makefile.am b/c/src/tests/mptests/mp14/Makefile.am index db1ff08d1d..2a2950ef0e 100644 --- a/c/src/tests/mptests/mp14/Makefile.am +++ b/c/src/tests/mptests/mp14/Makefile.am @@ -6,7 +6,8 @@ AUTOMAKE_OPTIONS = foreign 1.4 SUBDIRS = node1 node2 -EXTRA_DIST = system.h delay.c evtask1.c evtmtask.c exit.c init.c msgtask1.c pttask1.c smtask1.c +EXTRA_DIST = system.h delay.c evtask1.c evtmtask.c exit.c init.c msgtask1.c \ + pttask1.c smtask1.c include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/tests/mptests/mp14/node1/Makefile.am b/c/src/tests/mptests/mp14/node1/Makefile.am index 1e79f51e25..e03c43c6ae 100644 --- a/c/src/tests/mptests/mp14/node1/Makefile.am +++ b/c/src/tests/mptests/mp14/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp14/node2/Makefile.am b/c/src/tests/mptests/mp14/node2/Makefile.am index 28e92736db..6b394e10d0 100644 --- a/c/src/tests/mptests/mp14/node2/Makefile.am +++ b/c/src/tests/mptests/mp14/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp14/system.h b/c/src/tests/mptests/mp14/system.h index 92cb9881f3..6eacde2662 100644 --- a/c/src/tests/mptests/mp14/system.h +++ b/c/src/tests/mptests/mp14/system.h @@ -50,14 +50,15 @@ void Exit_test( void ); /* configuration information */ -#define CONFIGURE_MPTEST +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_TICKS_PER_TIMESLICE 1 #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(1) +#define CONFIGURE_MAXIMUM_TASKS 5 #if ( NODE_NUMBER == 1 ) #define CONFIGURE_MAXIMUM_TIMERS 12 #define CONFIGURE_MAXIMUM_SEMAPHORES 1 diff --git a/c/src/tests/psxtests/Makefile.am b/c/src/tests/psxtests/Makefile.am index e25e2b2b1a..6ac74865f8 100644 --- a/c/src/tests/psxtests/Makefile.am +++ b/c/src/tests/psxtests/Makefile.am @@ -5,14 +5,14 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -SHARED_DIRS = +SHARED_DIRS = POSIX_DIRS = include psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 \ psx09 psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01 POSIX_FILES_DIRS = psxfile01 psxreaddir psxstat psxmount psx13 -UNUSED_DIRS = +UNUSED_DIRS = SUBDIRS = $(SHARED_DIRS) $(POSIX_DIRS) $(POSIX_FILES_DIRS) $(UNUSED_DIRS) diff --git a/c/src/tests/psxtests/psx01/Makefile.am b/c/src/tests/psxtests/psx01/Makefile.am index 43b7c3a42a..e16bf6234d 100644 --- a/c/src/tests/psxtests/psx01/Makefile.am +++ b/c/src/tests/psxtests/psx01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx01 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx01/psx01.scn b/c/src/tests/psxtests/psx01/psx01.scn index b5983ba11f..fcab0f4c65 100644 --- a/c/src/tests/psxtests/psx01/psx01.scn +++ b/c/src/tests/psxtests/psx01/psx01.scn @@ -2,9 +2,11 @@ Init: uname - EFAULT (invalid uts pointer argument) Init: uts.sysname: RTEMS Init: uts.nodename: Node 1 -Init: uts.release: rtems-19991105 +Init: uts.release: rtems-VERSION +NOTE: VERSION will vary. Init: uts.version: -Init: uts.machine: SPARC/erc32 +Init: uts.machine: CPU/BSP +NOTE: CPU/BSP will vary. Init: clock_gettime - EINVAL (invalid clockid) Init: clock_settime - EINVAL (invalid clockid) diff --git a/c/src/tests/psxtests/psx01/system.h b/c/src/tests/psxtests/psx01/system.h index 9b55eea1d0..919521ed63 100644 --- a/c/src/tests/psxtests/psx01/system.h +++ b/c/src/tests/psxtests/psx01/system.h @@ -30,15 +30,13 @@ void *Task_1_through_3( /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_POSIX_THREADS 2 #define CONFIGURE_POSIX_INIT_THREAD_TABLE -#define CONFIGURE_MAXIMUM_POSIX_THREADS 2 - #include <confdefs.h> /* global variables */ diff --git a/c/src/tests/psxtests/psx02/Makefile.am b/c/src/tests/psxtests/psx02/Makefile.am index 8146141cc8..379c50442b 100644 --- a/c/src/tests/psxtests/psx02/Makefile.am +++ b/c/src/tests/psxtests/psx02/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx02 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx02/system.h b/c/src/tests/psxtests/psx02/system.h index 03e9810bd9..47e5d0c91f 100644 --- a/c/src/tests/psxtests/psx02/system.h +++ b/c/src/tests/psxtests/psx02/system.h @@ -28,10 +28,10 @@ void *Task_1_through_3( /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_POSIX_THREADS 2 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/c/src/tests/psxtests/psx03/Makefile.am b/c/src/tests/psxtests/psx03/Makefile.am index 7b8c930c62..fc91fe94e7 100644 --- a/c/src/tests/psxtests/psx03/Makefile.am +++ b/c/src/tests/psxtests/psx03/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx03 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx03/system.h b/c/src/tests/psxtests/psx03/system.h index 4aa2492a8c..cf5c7370a7 100644 --- a/c/src/tests/psxtests/psx03/system.h +++ b/c/src/tests/psxtests/psx03/system.h @@ -31,10 +31,10 @@ void *Task_2( /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_POSIX_THREADS 3 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/c/src/tests/psxtests/psx04/Makefile.am b/c/src/tests/psxtests/psx04/Makefile.am index 34ccd386b7..1a20658c84 100644 --- a/c/src/tests/psxtests/psx04/Makefile.am +++ b/c/src/tests/psxtests/psx04/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx04 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx04/system.h b/c/src/tests/psxtests/psx04/system.h index f4769c47d9..0619a921a1 100644 --- a/c/src/tests/psxtests/psx04/system.h +++ b/c/src/tests/psxtests/psx04/system.h @@ -35,11 +35,10 @@ void *Task_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_POSIX_THREADS 4 #define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 5 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/c/src/tests/psxtests/psx05/Makefile.am b/c/src/tests/psxtests/psx05/Makefile.am index 5103b2cd84..37f065ddbb 100644 --- a/c/src/tests/psxtests/psx05/Makefile.am +++ b/c/src/tests/psxtests/psx05/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx05 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx05/system.h b/c/src/tests/psxtests/psx05/system.h index ed901c71a9..92e010ef78 100644 --- a/c/src/tests/psxtests/psx05/system.h +++ b/c/src/tests/psxtests/psx05/system.h @@ -35,15 +35,14 @@ void *Task_3( /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_POSIX_THREADS 4 +#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 2 #define CONFIGURE_POSIX_INIT_THREAD_TABLE -#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 2 - #include <confdefs.h> /* global variables */ diff --git a/c/src/tests/psxtests/psx06/Makefile.am b/c/src/tests/psxtests/psx06/Makefile.am index 7f2b97c1f2..6d5a123fe5 100644 --- a/c/src/tests/psxtests/psx06/Makefile.am +++ b/c/src/tests/psxtests/psx06/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx06 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c task2.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx06/system.h b/c/src/tests/psxtests/psx06/system.h index de939d0c76..3aeef9bc67 100644 --- a/c/src/tests/psxtests/psx06/system.h +++ b/c/src/tests/psxtests/psx06/system.h @@ -31,15 +31,14 @@ void *Task_2( /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_POSIX_THREADS 3 +#define CONFIGURE_MAXIMUM_POSIX_KEYS 1 #define CONFIGURE_POSIX_INIT_THREAD_TABLE -#define CONFIGURE_MAXIMUM_POSIX_KEYS 1 - #include <confdefs.h> /* global variables */ diff --git a/c/src/tests/psxtests/psx07/Makefile.am b/c/src/tests/psxtests/psx07/Makefile.am index 979eb01209..e530b09f1c 100644 --- a/c/src/tests/psxtests/psx07/Makefile.am +++ b/c/src/tests/psxtests/psx07/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx07 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx07/system.h b/c/src/tests/psxtests/psx07/system.h index 0b5f3022c8..654a65713d 100644 --- a/c/src/tests/psxtests/psx07/system.h +++ b/c/src/tests/psxtests/psx07/system.h @@ -27,10 +27,10 @@ void *Task_1( /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_POSIX_THREADS 3 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/c/src/tests/psxtests/psx08/Makefile.am b/c/src/tests/psxtests/psx08/Makefile.am index e4cafdadcf..c027fcd470 100644 --- a/c/src/tests/psxtests/psx08/Makefile.am +++ b/c/src/tests/psxtests/psx08/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx08 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx08/system.h b/c/src/tests/psxtests/psx08/system.h index 305b20e724..c09e2585d2 100644 --- a/c/src/tests/psxtests/psx08/system.h +++ b/c/src/tests/psxtests/psx08/system.h @@ -35,10 +35,10 @@ void *Task_3( /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_POSIX_THREADS 4 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/c/src/tests/psxtests/psx09/Makefile.am b/c/src/tests/psxtests/psx09/Makefile.am index 9f8e2ad3d7..2a24e126a9 100644 --- a/c/src/tests/psxtests/psx09/Makefile.am +++ b/c/src/tests/psxtests/psx09/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx09 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx09/system.h b/c/src/tests/psxtests/psx09/system.h index 020b3f0892..9e2e590850 100644 --- a/c/src/tests/psxtests/psx09/system.h +++ b/c/src/tests/psxtests/psx09/system.h @@ -31,16 +31,15 @@ void *Task_2( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER - -#define CONFIGURE_POSIX_INIT_THREAD_TABLE +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_POSIX_THREADS 1 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES 10 +#define CONFIGURE_POSIX_INIT_THREAD_TABLE + #include <confdefs.h> /* global variables */ diff --git a/c/src/tests/psxtests/psx10/Makefile.am b/c/src/tests/psxtests/psx10/Makefile.am index 3b3811d517..6177343fe4 100644 --- a/c/src/tests/psxtests/psx10/Makefile.am +++ b/c/src/tests/psxtests/psx10/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx10 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx10/system.h b/c/src/tests/psxtests/psx10/system.h index a4f126a7f1..4662201e08 100644 --- a/c/src/tests/psxtests/psx10/system.h +++ b/c/src/tests/psxtests/psx10/system.h @@ -37,16 +37,14 @@ void *Task_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER - -#define CONFIGURE_POSIX_INIT_THREAD_TABLE +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_POSIX_THREADS 4 #define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 1 +#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 2 -#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 2 +#define CONFIGURE_POSIX_INIT_THREAD_TABLE #include <confdefs.h> diff --git a/c/src/tests/psxtests/psx11/Makefile.am b/c/src/tests/psxtests/psx11/Makefile.am index 9557cd7899..ce26d0b405 100644 --- a/c/src/tests/psxtests/psx11/Makefile.am +++ b/c/src/tests/psxtests/psx11/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx11 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx11/system.h b/c/src/tests/psxtests/psx11/system.h index 0b5f3022c8..ff5591c15c 100644 --- a/c/src/tests/psxtests/psx11/system.h +++ b/c/src/tests/psxtests/psx11/system.h @@ -27,10 +27,10 @@ void *Task_1( /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_POSIX_THREADS 4 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/c/src/tests/psxtests/psx12/Makefile.am b/c/src/tests/psxtests/psx12/Makefile.am index 29e1fb439e..36b542e921 100644 --- a/c/src/tests/psxtests/psx12/Makefile.am +++ b/c/src/tests/psxtests/psx12/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx12 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx12/system.h b/c/src/tests/psxtests/psx12/system.h index 20abeef4ea..fc627665b3 100644 --- a/c/src/tests/psxtests/psx12/system.h +++ b/c/src/tests/psxtests/psx12/system.h @@ -27,16 +27,15 @@ void *Task_1( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER - -#define CONFIGURE_POSIX_INIT_THREAD_TABLE +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_POSIX_THREADS 2 #define CONFIGURE_MAXIMUM_POSIX_KEYS 10 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES 10 +#define CONFIGURE_POSIX_INIT_THREAD_TABLE + #include <confdefs.h> /* global variables */ diff --git a/c/src/tests/psxtests/psx13/Makefile.am b/c/src/tests/psxtests/psx13/Makefile.am index 399eb51a49..ea281ed444 100644 --- a/c/src/tests/psxtests/psx13/Makefile.am +++ b/c/src/tests/psxtests/psx13/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx13 MANAGERS = all diff --git a/c/src/tests/psxtests/psx13/main.c b/c/src/tests/psxtests/psx13/main.c index 9f253e881b..36175c90a5 100644 --- a/c/src/tests/psxtests/psx13/main.c +++ b/c/src/tests/psxtests/psx13/main.c @@ -27,8 +27,13 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM +#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6 + +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/psxtests/psxcancel/Makefile.am b/c/src/tests/psxtests/psxcancel/Makefile.am index cde45d8fff..12046ffa82 100644 --- a/c/src/tests/psxtests/psxcancel/Makefile.am +++ b/c/src/tests/psxtests/psxcancel/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxcancel MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psxcancel/system.h b/c/src/tests/psxtests/psxcancel/system.h index 9b55eea1d0..919521ed63 100644 --- a/c/src/tests/psxtests/psxcancel/system.h +++ b/c/src/tests/psxtests/psxcancel/system.h @@ -30,15 +30,13 @@ void *Task_1_through_3( /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_POSIX_THREADS 2 #define CONFIGURE_POSIX_INIT_THREAD_TABLE -#define CONFIGURE_MAXIMUM_POSIX_THREADS 2 - #include <confdefs.h> /* global variables */ diff --git a/c/src/tests/psxtests/psxfile01/Makefile.am b/c/src/tests/psxtests/psxfile01/Makefile.am index 4cae479427..f7e47ec4f9 100644 --- a/c/src/tests/psxtests/psxfile01/Makefile.am +++ b/c/src/tests/psxtests/psxfile01/Makefile.am @@ -1,11 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -VPATH = @srcdir@ - TEST = psxfile01 MANAGERS = all diff --git a/c/src/tests/psxtests/psxfile01/main.c b/c/src/tests/psxtests/psxfile01/main.c index 9f253e881b..36175c90a5 100644 --- a/c/src/tests/psxtests/psxfile01/main.c +++ b/c/src/tests/psxtests/psxfile01/main.c @@ -27,8 +27,13 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM +#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6 + +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/psxtests/psxfile01/psxfile01.scn b/c/src/tests/psxtests/psxfile01/psxfile01.scn index 22923a2369..7d5f6d106e 100644 --- a/c/src/tests/psxtests/psxfile01/psxfile01.scn +++ b/c/src/tests/psxtests/psxfile01/psxfile01.scn @@ -1,4 +1,8 @@ +NOTE: If you get the following assertion, then your target does not +have enough memory in the heap used by malloc to allocate all the +files used during this test: +assertion "memory" failed: file "...../c/src/lib/libc/memfile.c", line 340 *** FILE TEST 1 *** *************** Dump of Entire IMFS *************** diff --git a/c/src/tests/psxtests/psxfile01/test.c b/c/src/tests/psxtests/psxfile01/test.c index 3d90e6e712..d935babd9f 100644 --- a/c/src/tests/psxtests/psxfile01/test.c +++ b/c/src/tests/psxtests/psxfile01/test.c @@ -388,8 +388,13 @@ int main( * triply indirect blocks. */ - test_extend( "/tmp/joel", max_size - 1 ); - test_cat( "/tmp/joel", max_size / 2, 1024 ); + if ( max_size < 300 * 1024 ) { + test_extend( "/tmp/joel", max_size - 1 ); + test_cat( "/tmp/joel", max_size / 2, 1024 ); + } else { + printf( "Skipping maximum file size test since max_size is %d bytes\n", max_size ); + puts("That is likely to be bigger than the available RAM on many targets." ); + } stat_a_file( "/tmp/joel" ); @@ -429,7 +434,7 @@ int main( status = rtems_task_wake_after( 1 * TICKS_PER_SECOND ); rewind( file ); while ( fgets(buffer, 128, file) ) - printf( buffer ); + printf( "%s", buffer ); /* * Verify only atime changed for a read. diff --git a/c/src/tests/psxtests/psxhdrs/Makefile.am b/c/src/tests/psxtests/psxhdrs/Makefile.am index 6233e205d2..15da64193e 100644 --- a/c/src/tests/psxtests/psxhdrs/Makefile.am +++ b/c/src/tests/psxtests/psxhdrs/Makefile.am @@ -1,29 +1,30 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -C_FILES = clock01.c clock02.c clock03.c clock04.c clock05.c clock06.c cond01.c \ - cond02.c cond03.c cond04.c cond05.c cond06.c cond07.c cond08.c cond09.c \ - cond10.c key01.c key02.c key03.c key04.c mutex01.c mutex02.c mutex03.c \ - mutex04.c mutex05.c mutex06.c mutex07.c mutex08.c mutex09.c mutex10.c \ - mutex11.c mutex12.c mutex13.c mutex14.c mutex15.c mutex16.c pthread01.c \ - pthread02.c pthread03.c pthread04.c pthread05.c pthread06.c pthread07.c \ - pthread08.c pthread09.c pthread10.c pthread11.c pthread12.c pthread13.c \ - pthread14.c pthread15.c pthread16.c pthread17.c pthread18.c pthread19.c \ - pthread20.c pthread21.c pthread22.c pthread23.c pthread24.c pthread25.c \ - pthread26.c pthread27.c pthread28.c pthread29.c pthread30.c pthread31.c \ - pthread32.c pthread33.c pthread34.c pthread35.c pthread36.c proc01.c \ - proc02.c proc03.c proc04.c proc05.c proc06.c proc07.c proc08.c proc09.c \ - proc10.c proc11.c proc12.c proc13.c proc14.c sched01.c sched02.c \ - sched03.c sched04.c sched05.c sched06.c sched07.c sched08.c signal01.c \ - signal02.c signal03.c signal04.c signal05.c signal06.c signal07.c \ - signal08.c signal09.c signal10.c signal11.c signal12.c signal13.c \ - signal14.c signal15.c signal16.c signal17.c signal18.c signal19.c \ - signal20.c signal21.c signal22.c time01.c time02.c time03.c time04.c \ - time05.c time06.c time07.c time08.c time09.c time10.c time11.c time12.c \ - time13.c timer01.c timer02.c timer03.c timer04.c timer05.c timer06.c +C_FILES = clock01.c clock02.c clock03.c clock04.c clock05.c clock06.c \ + cond01.c cond02.c cond03.c cond04.c cond05.c cond06.c cond07.c cond08.c \ + cond09.c cond10.c key01.c key02.c key03.c key04.c mutex01.c mutex02.c \ + mutex03.c mutex04.c mutex05.c mutex06.c mutex07.c mutex08.c mutex09.c \ + mutex10.c mutex11.c mutex12.c mutex13.c mutex14.c mutex15.c mutex16.c \ + pthread01.c pthread02.c pthread03.c pthread04.c pthread05.c pthread06.c \ + pthread07.c pthread08.c pthread09.c pthread10.c pthread11.c pthread12.c \ + pthread13.c pthread14.c pthread15.c pthread16.c pthread17.c pthread18.c \ + pthread19.c pthread20.c pthread21.c pthread22.c pthread23.c pthread24.c \ + pthread25.c pthread26.c pthread27.c pthread28.c pthread29.c pthread30.c \ + pthread31.c pthread32.c pthread33.c pthread34.c pthread35.c pthread36.c \ + proc01.c proc02.c proc03.c proc04.c proc05.c proc06.c proc07.c proc08.c \ + proc09.c proc10.c proc11.c proc12.c proc13.c proc14.c sched01.c \ + sched02.c sched03.c sched04.c sched05.c sched06.c sched07.c sched08.c \ + signal01.c signal02.c signal03.c signal04.c signal05.c signal06.c \ + signal07.c signal08.c signal09.c signal10.c signal11.c signal12.c \ + signal13.c signal14.c signal15.c signal16.c signal17.c signal18.c \ + signal19.c signal20.c signal21.c signal22.c time01.c time02.c time03.c \ + time04.c time05.c time06.c time07.c time08.c time09.c time10.c time11.c \ + time12.c time13.c timer01.c timer02.c timer03.c timer04.c timer05.c \ + timer06.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) SRCS = $(C_FILES) diff --git a/c/src/tests/psxtests/psxmount/Makefile.am b/c/src/tests/psxtests/psxmount/Makefile.am index c50a43ae19..38eb85ec95 100644 --- a/c/src/tests/psxtests/psxmount/Makefile.am +++ b/c/src/tests/psxtests/psxmount/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxmount MANAGERS = all diff --git a/c/src/tests/psxtests/psxmount/main.c b/c/src/tests/psxtests/psxmount/main.c index bd5e6165ae..d448d5fa3c 100644 --- a/c/src/tests/psxtests/psxmount/main.c +++ b/c/src/tests/psxtests/psxmount/main.c @@ -20,7 +20,12 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM +#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10 + +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/psxtests/psxmsgq01/Makefile.am b/c/src/tests/psxtests/psxmsgq01/Makefile.am index 0737b0b6e7..3cbb018a0d 100644 --- a/c/src/tests/psxtests/psxmsgq01/Makefile.am +++ b/c/src/tests/psxtests/psxmsgq01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxmsgq01 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psxmsgq01/system.h b/c/src/tests/psxtests/psxmsgq01/system.h index 97775c304e..2fdb05d705 100644 --- a/c/src/tests/psxtests/psxmsgq01/system.h +++ b/c/src/tests/psxtests/psxmsgq01/system.h @@ -31,17 +31,15 @@ void *Task_1_through_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_POSIX_INIT_THREAD_TABLE -#define CONFIGURE_MAXIMUM_POSIX_THREADS 5 -#define CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES 10 -#define CONFIGURE_MAXIMUM_POSIX_TIMERS 4 -#define CONFIGURE_MAXIMUM_TIMERS 4 +#define CONFIGURE_MAXIMUM_POSIX_THREADS 5 +#define CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES 10 +#define CONFIGURE_MAXIMUM_POSIX_TIMERS 4 +#define CONFIGURE_MAXIMUM_TIMERS 4 #define CONFIGURE_POSIX_INIT_THREAD_TABLE #define CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE \ diff --git a/c/src/tests/psxtests/psxreaddir/Makefile.am b/c/src/tests/psxtests/psxreaddir/Makefile.am index 25c955b899..6fb2c67812 100644 --- a/c/src/tests/psxtests/psxreaddir/Makefile.am +++ b/c/src/tests/psxtests/psxreaddir/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxreaddir MANAGERS = all diff --git a/c/src/tests/psxtests/psxreaddir/main.c b/c/src/tests/psxtests/psxreaddir/main.c index 0e8d54fc31..c19138573a 100644 --- a/c/src/tests/psxtests/psxreaddir/main.c +++ b/c/src/tests/psxtests/psxreaddir/main.c @@ -18,7 +18,12 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM +#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10 + +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/psxtests/psxsem01/Makefile.am b/c/src/tests/psxtests/psxsem01/Makefile.am index 59dba33b12..2fe85227b4 100644 --- a/c/src/tests/psxtests/psxsem01/Makefile.am +++ b/c/src/tests/psxtests/psxsem01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxsem01 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psxsem01/system.h b/c/src/tests/psxtests/psxsem01/system.h index 11ad344f3a..8237eab279 100644 --- a/c/src/tests/psxtests/psxsem01/system.h +++ b/c/src/tests/psxtests/psxsem01/system.h @@ -32,14 +32,12 @@ void *Task_1_through_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_POSIX_INIT_THREAD_TABLE -#define CONFIGURE_MAXIMUM_POSIX_THREADS 2 +#define CONFIGURE_MAXIMUM_POSIX_THREADS 2 #define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES 10 #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/c/src/tests/psxtests/psxstat/Makefile.am b/c/src/tests/psxtests/psxstat/Makefile.am index 9c20ed100c..19e747cdbe 100644 --- a/c/src/tests/psxtests/psxstat/Makefile.am +++ b/c/src/tests/psxtests/psxstat/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxstat MANAGERS = all diff --git a/c/src/tests/psxtests/psxstat/main.c b/c/src/tests/psxtests/psxstat/main.c index bced60fd25..f358a6ddb6 100644 --- a/c/src/tests/psxtests/psxstat/main.c +++ b/c/src/tests/psxtests/psxstat/main.c @@ -27,13 +27,17 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM +#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 10 + +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2) - #define CONFIGURE_INIT #include <confdefs.h> diff --git a/c/src/tests/psxtests/psxstat/test.c b/c/src/tests/psxtests/psxstat/test.c index 4fd49726b7..995f33adb6 100644 --- a/c/src/tests/psxtests/psxstat/test.c +++ b/c/src/tests/psxtests/psxstat/test.c @@ -239,14 +239,8 @@ void chown_multiple_files( uid_t st_uid; gid_t st_gid; -#if defined(RTEMS_POSIX_API) st_uid = geteuid(); st_gid = getegid(); -#else - st_uid = 100; -e - st_gid = 0; -#endif i = 0; while ( files[i] ) { diff --git a/c/src/tests/psxtests/psxtime/Makefile.am b/c/src/tests/psxtests/psxtime/Makefile.am index 66b8c88f11..12908cdede 100644 --- a/c/src/tests/psxtests/psxtime/Makefile.am +++ b/c/src/tests/psxtests/psxtime/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxtime MANAGERS = all diff --git a/c/src/tests/psxtests/psxtime/main.c b/c/src/tests/psxtests/psxtime/main.c index 9f253e881b..7643c1fbd4 100644 --- a/c/src/tests/psxtests/psxtime/main.c +++ b/c/src/tests/psxtests/psxtime/main.c @@ -27,8 +27,10 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/psxtests/psxtimer/Makefile.am b/c/src/tests/psxtests/psxtimer/Makefile.am index 7498d8514d..6d21b85a75 100644 --- a/c/src/tests/psxtests/psxtimer/Makefile.am +++ b/c/src/tests/psxtests/psxtimer/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxtimer MANAGERS = all diff --git a/c/src/tests/psxtests/psxtimer/system.h b/c/src/tests/psxtests/psxtimer/system.h index 9b6fe33dee..38c9bc6a92 100644 --- a/c/src/tests/psxtests/psxtimer/system.h +++ b/c/src/tests/psxtests/psxtimer/system.h @@ -36,21 +36,15 @@ void *task_c( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_POSIX_INIT_THREAD_TABLE -#define CONFIGURE_MAXIMUM_POSIX_THREADS 4 - -#define CONFIGURE_MAXIMUM_POSIX_TIMERS 4 - -#define CONFIGURE_MAXIMUM_TIMERS 4 - -#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 2 - +#define CONFIGURE_MAXIMUM_POSIX_THREADS 4 +#define CONFIGURE_MAXIMUM_POSIX_TIMERS 4 +#define CONFIGURE_MAXIMUM_TIMERS 4 +#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 2 #define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 2 diff --git a/c/src/tests/samples/Makefile.am b/c/src/tests/samples/Makefile.am index e8c84121ac..04c3059990 100644 --- a/c/src/tests/samples/Makefile.am +++ b/c/src/tests/samples/Makefile.am @@ -15,8 +15,7 @@ FP_TESTS = paranoia SUBDIRS = hello ticker base_sp unlimited minimum $(MP_TESTS) \ $(CPLUSPLUS_TESTS) $(FP_TESTS) -AUTOMAKE_FILES = \ -sample.am +AUTOMAKE_FILES = sample.am EXTRA_DIST = $(AUTOMAKE_FILES) diff --git a/c/src/tests/samples/base_mp/apptask.c b/c/src/tests/samples/base_mp/apptask.c index 5303b180d4..566ca7188f 100644 --- a/c/src/tests/samples/base_mp/apptask.c +++ b/c/src/tests/samples/base_mp/apptask.c @@ -20,6 +20,7 @@ */ #include "system.h" +#include <stdio.h> rtems_task Application_task( rtems_task_argument node diff --git a/c/src/tests/samples/base_mp/init.c b/c/src/tests/samples/base_mp/init.c index d47113d832..a30bed867f 100644 --- a/c/src/tests/samples/base_mp/init.c +++ b/c/src/tests/samples/base_mp/init.c @@ -20,8 +20,9 @@ * $Id$ */ -#define TEST_INIT +#define CONFIGURE_INIT #include "system.h" +#include <stdio.h> rtems_task Init( rtems_task_argument argument diff --git a/c/src/tests/samples/base_mp/system.h b/c/src/tests/samples/base_mp/system.h index b45fe15bd9..428a5019e3 100644 --- a/c/src/tests/samples/base_mp/system.h +++ b/c/src/tests/samples/base_mp/system.h @@ -13,7 +13,7 @@ * $Id$ */ -#include <tmacros.h> +#include <rtems.h> /* functions */ @@ -27,11 +27,15 @@ rtems_task Application_task( /* configuration information */ -#define CONFIGURE_MPTEST +#include <bsp.h> /* for device driver prototypes */ + +#define CONFIGURE_MP_APPLICATION -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 + #define CONFIGURE_RTEMS_INIT_TASKS_TABLE /* @@ -40,8 +44,4 @@ rtems_task Application_task( #include <confdefs.h> -/* variables */ - -TEST_EXTERN rtems_id Global_variable; /* example global variable */ - /* end of include file */ diff --git a/c/src/tests/samples/base_sp/apptask.c b/c/src/tests/samples/base_sp/apptask.c index c7b6580fad..050b2130bf 100644 --- a/c/src/tests/samples/base_sp/apptask.c +++ b/c/src/tests/samples/base_sp/apptask.c @@ -19,6 +19,7 @@ */ #include "system.h" +#include <stdio.h> rtems_task Application_task( rtems_task_argument argument diff --git a/c/src/tests/samples/base_sp/init.c b/c/src/tests/samples/base_sp/init.c index d787f0233e..e5eae4c9a5 100644 --- a/c/src/tests/samples/base_sp/init.c +++ b/c/src/tests/samples/base_sp/init.c @@ -20,8 +20,9 @@ * $Id$ */ -#define TEST_INIT +#define CONFIGURE_INIT #include "system.h" +#include <stdio.h> #define ARGUMENT 0 diff --git a/c/src/tests/samples/base_sp/system.h b/c/src/tests/samples/base_sp/system.h index 25139380f6..233cbb7f2f 100644 --- a/c/src/tests/samples/base_sp/system.h +++ b/c/src/tests/samples/base_sp/system.h @@ -13,7 +13,7 @@ * $Id$ */ -#include <tmacros.h> +#include <rtems.h> /* functions */ @@ -27,17 +27,14 @@ rtems_task Application_task( /* configuration information */ -#define CONFIGURE_SPTEST +#include <bsp.h> /* for device driver prototypes */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #include <confdefs.h> -/* global variables */ - -TEST_EXTERN rtems_id Global_variable; /* example global variable */ - /* end of include file */ diff --git a/c/src/tests/samples/cdtest/Makefile.am b/c/src/tests/samples/cdtest/Makefile.am index 0bdf792c92..309974bb4f 100644 --- a/c/src/tests/samples/cdtest/Makefile.am +++ b/c/src/tests/samples/cdtest/Makefile.am @@ -26,8 +26,6 @@ OBJS = $(C_O_FILES) $(CC_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(SAMPLE).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/sample.am diff --git a/c/src/tests/samples/cdtest/init.c b/c/src/tests/samples/cdtest/init.c index 807cd9e5ab..1df5302b50 100644 --- a/c/src/tests/samples/cdtest/init.c +++ b/c/src/tests/samples/cdtest/init.c @@ -20,6 +20,6 @@ * $Id$ */ -#define TEST_INIT +#define CONFIGURE_INIT #include "system.h" #include <stdio.h> diff --git a/c/src/tests/samples/cdtest/system.h b/c/src/tests/samples/cdtest/system.h index 234651fc69..557f3fea8c 100644 --- a/c/src/tests/samples/cdtest/system.h +++ b/c/src/tests/samples/cdtest/system.h @@ -13,7 +13,7 @@ * $Id$ */ -#include <tmacros.h> +#include <rtems.h> /* functions */ @@ -23,10 +23,12 @@ rtems_task main_task( /* configuration information */ -#define CONFIGURE_SPTEST +#include <bsp.h> /* for device driver prototypes */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_INIT_TASK_ENTRY_POINT main_task @@ -34,8 +36,4 @@ rtems_task main_task( #include <confdefs.h> -/* global variables */ - -TEST_EXTERN rtems_id Global_variable; /* example global variable */ - /* end of include file */ diff --git a/c/src/tests/samples/hello/Makefile.am b/c/src/tests/samples/hello/Makefile.am index 8f3ec339ab..9dfe2bafac 100644 --- a/c/src/tests/samples/hello/Makefile.am +++ b/c/src/tests/samples/hello/Makefile.am @@ -23,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(SAMPLE).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/sample.am diff --git a/c/src/tests/samples/hello/init.c b/c/src/tests/samples/hello/init.c index 344617d598..adda41cd20 100644 --- a/c/src/tests/samples/hello/init.c +++ b/c/src/tests/samples/hello/init.c @@ -20,7 +20,7 @@ * $Id$ */ -#define TEST_INIT +#define CONFIGURE_INIT #include "system.h" #include <stdio.h> diff --git a/c/src/tests/samples/hello/system.h b/c/src/tests/samples/hello/system.h index d27a884301..79a57713d0 100644 --- a/c/src/tests/samples/hello/system.h +++ b/c/src/tests/samples/hello/system.h @@ -13,7 +13,7 @@ * $Id$ */ -#include <tmacros.h> +#include <rtems.h> /* functions */ @@ -23,7 +23,11 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER +#include <bsp.h> /* for device driver prototypes */ + +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE @@ -31,8 +35,4 @@ rtems_task Init( #include <confdefs.h> -/* global variables */ - -TEST_EXTERN rtems_id Global_variable; /* example global variable */ - /* end of include file */ diff --git a/c/src/tests/samples/minimum/Makefile.am b/c/src/tests/samples/minimum/Makefile.am index 0ac5f1fe20..6ebaef357d 100644 --- a/c/src/tests/samples/minimum/Makefile.am +++ b/c/src/tests/samples/minimum/Makefile.am @@ -20,8 +20,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(SAMPLE).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/sample.am diff --git a/c/src/tests/samples/minimum/init.c b/c/src/tests/samples/minimum/init.c index 64a1aa7b62..980393f0b2 100644 --- a/c/src/tests/samples/minimum/init.c +++ b/c/src/tests/samples/minimum/init.c @@ -15,7 +15,7 @@ * $Id$ */ -#include <rtems.h> +#include <bsp.h> rtems_task Init( rtems_task_argument ignored @@ -25,10 +25,14 @@ rtems_task Init( /* configuration information */ +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM +#define CONFIGURE_MAXIMUM_TASKS 1 + #define CONFIGURE_INIT #include <confdefs.h> diff --git a/c/src/tests/samples/paranoia/Makefile.am b/c/src/tests/samples/paranoia/Makefile.am index 6611f6efe5..d5bcb524ba 100644 --- a/c/src/tests/samples/paranoia/Makefile.am +++ b/c/src/tests/samples/paranoia/Makefile.am @@ -23,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(SAMPLE).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/sample.am diff --git a/c/src/tests/samples/paranoia/init.c b/c/src/tests/samples/paranoia/init.c index 980a07d7c8..9b836519c3 100644 --- a/c/src/tests/samples/paranoia/init.c +++ b/c/src/tests/samples/paranoia/init.c @@ -20,8 +20,9 @@ * $Id$ */ -#define TEST_INIT +#define CONFIGURE_INIT #include "system.h" +#include <stdio.h> extern int paranoia(int, char **); diff --git a/c/src/tests/samples/paranoia/system.h b/c/src/tests/samples/paranoia/system.h index 5996032cb1..359e255882 100644 --- a/c/src/tests/samples/paranoia/system.h +++ b/c/src/tests/samples/paranoia/system.h @@ -13,7 +13,7 @@ * $Id$ */ -#include <tmacros.h> +#include <rtems.h> /* functions */ @@ -23,8 +23,12 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#include <bsp.h> /* for device driver prototypes */ + +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_FLOATING_POINT @@ -34,8 +38,4 @@ rtems_task Init( #include <confdefs.h> -/* global variables */ - -TEST_EXTERN rtems_id Global_variable; /* example global variable */ - /* end of include file */ diff --git a/c/src/tests/samples/ticker/Makefile.am b/c/src/tests/samples/ticker/Makefile.am index 7c699ce03b..1129c917b7 100644 --- a/c/src/tests/samples/ticker/Makefile.am +++ b/c/src/tests/samples/ticker/Makefile.am @@ -23,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(SAMPLE).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/sample.am diff --git a/c/src/tests/samples/ticker/init.c b/c/src/tests/samples/ticker/init.c index cd8c688887..36f3fd58f6 100644 --- a/c/src/tests/samples/ticker/init.c +++ b/c/src/tests/samples/ticker/init.c @@ -20,8 +20,16 @@ * $Id$ */ -#define TEST_INIT +#define CONFIGURE_INIT #include "system.h" +#include <stdio.h> + +/* + * Keep the names and IDs in global variables so another task can use them. + */ + +rtems_id Task_id[ 4 ]; /* array of task ids */ +rtems_name Task_name[ 4 ]; /* array of task names */ rtems_task Init( rtems_task_argument argument @@ -32,7 +40,14 @@ rtems_task Init( puts( "\n\n*** CLOCK TICK TEST ***" ); - build_time( &time, 12, 31, 1988, 9, 0, 0, 0 ); + time.year = 1988; + time.month = 12; + time.day = 31; + time.hour = 9; + time.minute = 0; + time.second = 0; + time.ticks = 0; + status = rtems_clock_set( &time ); Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' ); diff --git a/c/src/tests/samples/ticker/system.h b/c/src/tests/samples/ticker/system.h index 0e50198815..7a0caa93ba 100644 --- a/c/src/tests/samples/ticker/system.h +++ b/c/src/tests/samples/ticker/system.h @@ -13,7 +13,7 @@ * $Id$ */ -#include <tmacros.h> +#include <rtems.h> /* functions */ @@ -25,12 +25,24 @@ rtems_task Test_task( rtems_task_argument argument ); +/* global variables */ + +/* + * Keep the names and IDs in global variables so another task can use them. + */ + +extern rtems_id Task_id[ 4 ]; /* array of task ids */ +extern rtems_name Task_name[ 4 ]; /* array of task names */ + + /* configuration information */ -#define CONFIGURE_SPTEST +#include <bsp.h> /* for device driver prototypes */ + +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE @@ -38,9 +50,66 @@ rtems_task Test_task( #include <confdefs.h> -/* global variables */ +/* + * Handy macros and static inline functions + */ + +/* + * Macro to hide the ugliness of printing the time. + */ + +#define print_time(_s1, _tb, _s2) \ + do { \ + printf( "%s%02d:%02d:%02d %02d/%02d/%04d%s", \ + _s1, (_tb)->hour, (_tb)->minute, (_tb)->second, \ + (_tb)->month, (_tb)->day, (_tb)->year, _s2 ); \ + fflush(stdout); \ + } while ( 0 ) + +/* + * Macro to print an task name that is composed of ASCII characters. + * + */ + +#define put_name( _name, _crlf ) \ + do { \ + rtems_unsigned32 c0, c1, c2, c3; \ + \ + c0 = ((_name) >> 24) & 0xff; \ + c1 = ((_name) >> 16) & 0xff; \ + c2 = ((_name) >> 8) & 0xff; \ + c3 = (_name) & 0xff; \ + putchar( (char)c0 ); \ + if ( c1 ) putchar( (char)c1 ); \ + if ( c2 ) putchar( (char)c2 ); \ + if ( c3 ) putchar( (char)c3 ); \ + if ( (_crlf) ) \ + putchar( '\n' ); \ + } while (0) + +/* + * static inline routine to make obtaining ticks per second easier. + */ + +static inline rtems_unsigned32 get_ticks_per_second( void ) +{ + rtems_interval ticks_per_second; + (void) rtems_clock_get( RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticks_per_second ); return ticks_per_second; +} + + +/* + * This allows us to view the "Test_task" instantiations as a set + * of numbered tasks by eliminating the number of application + * tasks created. + * + * In reality, this is too complex for the purposes of this + * example. It would have been easier to pass a task argument. :) + * But it shows how rtems_id's can sometimes be used. + */ -TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */ -TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */ +#define task_number( tid ) \ + ( rtems_get_index( tid ) - \ + rtems_configuration_get_rtems_api_configuration()->number_of_initialization_tasks ) /* end of include file */ diff --git a/c/src/tests/samples/ticker/tasks.c b/c/src/tests/samples/ticker/tasks.c index b87a26cbbe..d539b967bd 100644 --- a/c/src/tests/samples/ticker/tasks.c +++ b/c/src/tests/samples/ticker/tasks.c @@ -18,6 +18,7 @@ */ #include "system.h" +#include <stdio.h> rtems_task Test_task( rtems_task_argument unused @@ -30,7 +31,7 @@ rtems_task Test_task( status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid ); task_index = task_number( tid ); - while( FOREVER ) { + for ( ; ; ) { status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time ); if ( time.second >= 35 ) { puts( "*** END OF CLOCK TICK TEST ***" ); @@ -38,6 +39,6 @@ rtems_task Test_task( } put_name( Task_name[ task_index ], FALSE ); print_time( " - rtems_clock_get - ", &time, "\n" ); - status = rtems_task_wake_after( task_index * 5 * TICKS_PER_SECOND ); + status = rtems_task_wake_after( task_index * 5 * get_ticks_per_second() ); } } diff --git a/c/src/tests/samples/unlimited/Makefile.am b/c/src/tests/samples/unlimited/Makefile.am index 32b865776d..a940b9810c 100644 --- a/c/src/tests/samples/unlimited/Makefile.am +++ b/c/src/tests/samples/unlimited/Makefile.am @@ -23,8 +23,6 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) -PGM = ${ARCH}/$(SAMPLE).exe - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/sample.am diff --git a/c/src/tests/samples/unlimited/init.c b/c/src/tests/samples/unlimited/init.c index 5036e72527..043e60dafd 100644 --- a/c/src/tests/samples/unlimited/init.c +++ b/c/src/tests/samples/unlimited/init.c @@ -21,7 +21,7 @@ * $Id$ */ -#define TEST_INIT +#define CONFIGURE_INIT #include "system.h" #include <stdio.h> diff --git a/c/src/tests/samples/unlimited/system.h b/c/src/tests/samples/unlimited/system.h index 5be04f0b6d..a48aa0a5a0 100644 --- a/c/src/tests/samples/unlimited/system.h +++ b/c/src/tests/samples/unlimited/system.h @@ -16,8 +16,6 @@ #include <rtems.h> -#include <tmacros.h> - /* functions */ rtems_task Init( @@ -43,7 +41,9 @@ void test3(); /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER +#include <bsp.h> /* for device driver prototypes */ + +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER #define CONFIGURE_RTEMS_INIT_TASKS_TABLE @@ -54,10 +54,6 @@ void test3(); #include <confdefs.h> -/* global variables */ - -TEST_EXTERN rtems_id Global_variable; /* example global variable */ - /* * Keep track of the task id's created, use a large array. */ diff --git a/c/src/tests/sptests/sp01/Makefile.am b/c/src/tests/sptests/sp01/Makefile.am index 065e7bcc2b..75bfbcc736 100644 --- a/c/src/tests/sptests/sp01/Makefile.am +++ b/c/src/tests/sptests/sp01/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp01/system.h b/c/src/tests/sptests/sp01/system.h index 5a1cbad8b8..3d4b636d38 100644 --- a/c/src/tests/sptests/sp01/system.h +++ b/c/src/tests/sptests/sp01/system.h @@ -27,14 +27,13 @@ rtems_task Task_1_through_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE) +#define CONFIGURE_MAXIMUM_TASKS 4 #include <confdefs.h> diff --git a/c/src/tests/sptests/sp02/Makefile.am b/c/src/tests/sptests/sp02/Makefile.am index 174e249375..ea8b740cad 100644 --- a/c/src/tests/sptests/sp02/Makefile.am +++ b/c/src/tests/sptests/sp02/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c preempt.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp02/system.h b/c/src/tests/sptests/sp02/system.h index b383c058e3..0303a97812 100644 --- a/c/src/tests/sptests/sp02/system.h +++ b/c/src/tests/sptests/sp02/system.h @@ -39,12 +39,11 @@ rtems_task Task_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_RTEMS_INIT_TASKS_TABLE +#define CONFIGURE_MAXIMUM_TASKS 4 #include <confdefs.h> diff --git a/c/src/tests/sptests/sp03/Makefile.am b/c/src/tests/sptests/sp03/Makefile.am index 8224948a64..4b3096643c 100644 --- a/c/src/tests/sptests/sp03/Makefile.am +++ b/c/src/tests/sptests/sp03/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp03/system.h b/c/src/tests/sptests/sp03/system.h index 72d992def9..79bd7232cc 100644 --- a/c/src/tests/sptests/sp03/system.h +++ b/c/src/tests/sptests/sp03/system.h @@ -31,14 +31,14 @@ rtems_task Task_2( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXTRA_TASK_STACKS (1 * RTEMS_MINIMUM_STACK_SIZE) +#define CONFIGURE_MAXIMUM_TASKS 3 + #include <confdefs.h> diff --git a/c/src/tests/sptests/sp04/Makefile.am b/c/src/tests/sptests/sp04/Makefile.am index 925439b0e3..07a6f11e46 100644 --- a/c/src/tests/sptests/sp04/Makefile.am +++ b/c/src/tests/sptests/sp04/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c tswitch.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp04/system.h b/c/src/tests/sptests/sp04/system.h index f7f2832f54..cf5d6216f2 100644 --- a/c/src/tests/sptests/sp04/system.h +++ b/c/src/tests/sptests/sp04/system.h @@ -40,10 +40,8 @@ void Task_switch( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1 #define CONFIGURE_TICKS_PER_TIMESLICE 100 @@ -51,6 +49,7 @@ void Task_switch( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE) +#define CONFIGURE_MAXIMUM_TASKS 4 #include <confdefs.h> @@ -68,12 +67,15 @@ TEST_EXTERN volatile rtems_unsigned32 Run_count[ 4 ]; /* * Keep track of task switches */ + struct taskSwitchLog { int taskIndex; rtems_time_of_day when; }; + extern struct taskSwitchLog taskSwitchLog[]; extern int taskSwitchLogIndex; volatile extern int testsFinished; + /* end of include file */ diff --git a/c/src/tests/sptests/sp04/tswitch.c b/c/src/tests/sptests/sp04/tswitch.c index 975ca710c3..a573adbb1e 100644 --- a/c/src/tests/sptests/sp04/tswitch.c +++ b/c/src/tests/sptests/sp04/tswitch.c @@ -24,7 +24,7 @@ struct taskSwitchLog taskSwitchLog[1000]; int taskSwitchLogIndex; -volatile int testsFinished;; +volatile int testsFinished; rtems_extension Task_switch( rtems_tcb *unused, diff --git a/c/src/tests/sptests/sp05/Makefile.am b/c/src/tests/sptests/sp05/Makefile.am index 8e1d268e43..e64f03ad97 100644 --- a/c/src/tests/sptests/sp05/Makefile.am +++ b/c/src/tests/sptests/sp05/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp05/system.h b/c/src/tests/sptests/sp05/system.h index ec5c85e9a0..5b1cca7d5c 100644 --- a/c/src/tests/sptests/sp05/system.h +++ b/c/src/tests/sptests/sp05/system.h @@ -35,14 +35,13 @@ rtems_task Task_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_TICKS_PER_TIMESLICE 100 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE +#define CONFIGURE_MAXIMUM_TASKS 4 #include <confdefs.h> diff --git a/c/src/tests/sptests/sp06/Makefile.am b/c/src/tests/sptests/sp06/Makefile.am index 92d63010ba..2b6e8e7acb 100644 --- a/c/src/tests/sptests/sp06/Makefile.am +++ b/c/src/tests/sptests/sp06/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp06/system.h b/c/src/tests/sptests/sp06/system.h index f7687256bc..a397754d5f 100644 --- a/c/src/tests/sptests/sp06/system.h +++ b/c/src/tests/sptests/sp06/system.h @@ -35,14 +35,13 @@ rtems_task Task_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_TICKS_PER_TIMESLICE 100 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE +#define CONFIGURE_MAXIMUM_TASKS 4 #include <confdefs.h> diff --git a/c/src/tests/sptests/sp07/Makefile.am b/c/src/tests/sptests/sp07/Makefile.am index e61682c6b3..0b32e89e7f 100644 --- a/c/src/tests/sptests/sp07/Makefile.am +++ b/c/src/tests/sptests/sp07/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -13,7 +13,7 @@ C_FILES = init.c task1.c task2.c task3.c task4.c taskexit.c tcreate.c \ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp07/system.h b/c/src/tests/sptests/sp07/system.h index f9f8ddcdf4..d739d70cef 100644 --- a/c/src/tests/sptests/sp07/system.h +++ b/c/src/tests/sptests/sp07/system.h @@ -63,10 +63,8 @@ rtems_extension Task_exit_extension( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1 #define CONFIGURE_TICKS_PER_TIMESLICE 100 @@ -74,6 +72,7 @@ rtems_extension Task_exit_extension( #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE) +#define CONFIGURE_MAXIMUM_TASKS 5 #include <confdefs.h> diff --git a/c/src/tests/sptests/sp08/Makefile.am b/c/src/tests/sptests/sp08/Makefile.am index f729b3ae59..b1970b863c 100644 --- a/c/src/tests/sptests/sp08/Makefile.am +++ b/c/src/tests/sptests/sp08/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp08/system.h b/c/src/tests/sptests/sp08/system.h index fcc21d7b2a..5bb3407dac 100644 --- a/c/src/tests/sptests/sp08/system.h +++ b/c/src/tests/sptests/sp08/system.h @@ -30,16 +30,15 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_TICKS_PER_TIMESLICE 100 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXTRA_TASK_STACKS (1 * RTEMS_MINIMUM_STACK_SIZE) +#define CONFIGURE_MAXIMUM_TASKS 2 #include <confdefs.h> diff --git a/c/src/tests/sptests/sp09/Makefile.am b/c/src/tests/sptests/sp09/Makefile.am index 095c8876f0..f61470e2e6 100644 --- a/c/src/tests/sptests/sp09/Makefile.am +++ b/c/src/tests/sptests/sp09/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -16,7 +16,7 @@ C_FILES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen04.c \ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp09/screen07.c b/c/src/tests/sptests/sp09/screen07.c index 26dab852d5..737ba70a1f 100644 --- a/c/src/tests/sptests/sp09/screen07.c +++ b/c/src/tests/sptests/sp09/screen07.c @@ -18,6 +18,8 @@ #include "system.h" +#define MESSAGE_SIZE (sizeof(long) * 4) + void Screen7() { long buffer[ 4 ]; @@ -25,7 +27,7 @@ void Screen7() rtems_unsigned32 count; rtems_status_code status; - status = rtems_message_queue_broadcast( 100, (long (*)[4]) buffer, 16, &count ); + status = rtems_message_queue_broadcast( 100, buffer, MESSAGE_SIZE, &count ); fatal_directive_status( status, RTEMS_INVALID_ID, @@ -36,7 +38,7 @@ void Screen7() status = rtems_message_queue_create( 0, 3, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Junk_id ); @@ -56,7 +58,7 @@ void Screen7() status = rtems_message_queue_create( Queue_name[ 1 ], 1, - 16, + MESSAGE_SIZE, RTEMS_GLOBAL, &Junk_id ); @@ -71,7 +73,7 @@ void Screen7() status = rtems_message_queue_create( Queue_name[ 1 ], 2, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id[ 1 ] ); @@ -83,7 +85,7 @@ void Screen7() status = rtems_message_queue_create( Queue_name[ 2 ], 1, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Junk_id ); @@ -180,7 +182,7 @@ void Screen7() "TA1 - rtems_message_queue_receive - Q 1 - woke up with RTEMS_TIMEOUT" ); - status = rtems_message_queue_send( 100, (long (*)[4]) buffer, 16 ); + status = rtems_message_queue_send( 100, buffer, MESSAGE_SIZE ); fatal_directive_status( status, RTEMS_INVALID_ID, @@ -188,15 +190,15 @@ void Screen7() ); puts( "TA1 - rtems_message_queue_send - RTEMS_INVALID_ID" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4]) buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); fatal_directive_status( status, RTEMS_TOO_MANY, diff --git a/c/src/tests/sptests/sp09/screen08.c b/c/src/tests/sptests/sp09/screen08.c index dd0a9afba4..76af9e8bb9 100644 --- a/c/src/tests/sptests/sp09/screen08.c +++ b/c/src/tests/sptests/sp09/screen08.c @@ -18,6 +18,8 @@ #include "system.h" +#define MESSAGE_SIZE (sizeof(long) * 4) + void Screen8() { long buffer[ 4 ]; @@ -30,7 +32,7 @@ void Screen8() status = rtems_message_queue_create( Queue_name[ 1 ], 2, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id[ 1 ] ); @@ -39,15 +41,15 @@ void Screen8() "TA1 - rtems_message_queue_create - Q 1 - 2 DEEP - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send successful" ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send successful" ); puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); fatal_directive_status( status, RTEMS_TOO_MANY, @@ -62,7 +64,7 @@ void Screen8() status = rtems_message_queue_create( Queue_name[ 1 ], 3, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id[ 1 ] ); @@ -71,19 +73,19 @@ void Screen8() "TA1 - rtems_message_queue_create - Q 1 - 3 DEEP - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send successful" ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send successful" ); puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send successful" ); puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1 - RTEMS_SUCCESSFUL" ); - status = rtems_message_queue_send( Queue_id[ 1 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); fatal_directive_status( status, RTEMS_TOO_MANY, @@ -100,7 +102,7 @@ void Screen8() status = rtems_message_queue_create( Queue_name[ 1 ], 3, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id[ 1 ] ); diff --git a/c/src/tests/sptests/sp09/system.h b/c/src/tests/sptests/sp09/system.h index c3a93d3b80..b9f10eb1d5 100644 --- a/c/src/tests/sptests/sp09/system.h +++ b/c/src/tests/sptests/sp09/system.h @@ -80,11 +80,10 @@ void Screen14( void ); /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 10 #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_MAXIMUM_SEMAPHORES 2 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/sptests/sp11/Makefile.am b/c/src/tests/sptests/sp11/Makefile.am index a2641d0e0d..89222d514d 100644 --- a/c/src/tests/sptests/sp11/Makefile.am +++ b/c/src/tests/sptests/sp11/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c timer.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp11/system.h b/c/src/tests/sptests/sp11/system.h index 133f23ec5d..be3df1116a 100644 --- a/c/src/tests/sptests/sp11/system.h +++ b/c/src/tests/sptests/sp11/system.h @@ -66,11 +66,10 @@ rtems_timer_service_routine TA2_send_10_to_self( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 3 #define CONFIGURE_MAXIMUM_TIMERS 6 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/c/src/tests/sptests/sp12/Makefile.am b/c/src/tests/sptests/sp12/Makefile.am index cd748472e5..8f45e4bedc 100644 --- a/c/src/tests/sptests/sp12/Makefile.am +++ b/c/src/tests/sptests/sp12/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c task4.c task5.c pridrv.c pritask.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp12/system.h b/c/src/tests/sptests/sp12/system.h index 9ab3cb985f..134bb17578 100644 --- a/c/src/tests/sptests/sp12/system.h +++ b/c/src/tests/sptests/sp12/system.h @@ -51,12 +51,11 @@ rtems_task Task5( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2) +#define CONFIGURE_MAXIMUM_TASKS 8 #define CONFIGURE_MAXIMUM_SEMAPHORES 10 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/c/src/tests/sptests/sp13/Makefile.am b/c/src/tests/sptests/sp13/Makefile.am index e5cd4b406b..d6c57a86ff 100644 --- a/c/src/tests/sptests/sp13/Makefile.am +++ b/c/src/tests/sptests/sp13/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c fillbuff.c putbuff.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp13/fillbuff.c b/c/src/tests/sptests/sp13/fillbuff.c index 728606e5bb..6930913d3d 100644 --- a/c/src/tests/sptests/sp13/fillbuff.c +++ b/c/src/tests/sptests/sp13/fillbuff.c @@ -21,10 +21,26 @@ #include "system.h" +#define MESSAGE_SIZE (sizeof(long) * 4) + void Fill_buffer( char *source, long *buffer ) { + char *p; + int i; +/* memcpy( buffer, source, 16 ); +*/ + p = source; + for ( i=0 ; i<MESSAGE_SIZE ; i++ ) { + buffer[i] = *p++; + buffer[i] <<= 8; + buffer[i] |= *p++; + buffer[i] <<= 8; + buffer[i] |= *p++; + buffer[i] <<= 8; + buffer[i] |= *p++; + } } diff --git a/c/src/tests/sptests/sp13/init.c b/c/src/tests/sptests/sp13/init.c index 2614d2a5d4..5d89586c86 100644 --- a/c/src/tests/sptests/sp13/init.c +++ b/c/src/tests/sptests/sp13/init.c @@ -24,6 +24,8 @@ #define TEST_INIT #include "system.h" +#define MESSAGE_SIZE (sizeof(long) * 4) + rtems_task Init( rtems_task_argument argument ) @@ -82,7 +84,7 @@ rtems_task Init( status = rtems_message_queue_create( Queue_name[ 1 ], 100, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id[ 1 ] ); @@ -91,7 +93,7 @@ rtems_task Init( status = rtems_message_queue_create( Queue_name[ 2 ], 10, - 16, + MESSAGE_SIZE, RTEMS_PRIORITY, &Queue_id[ 2 ] ); @@ -100,7 +102,7 @@ rtems_task Init( status = rtems_message_queue_create( Queue_name[ 3 ], 100, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id[ 3 ] ); diff --git a/c/src/tests/sptests/sp13/putbuff.c b/c/src/tests/sptests/sp13/putbuff.c index 26bf149049..70b23ff72f 100644 --- a/c/src/tests/sptests/sp13/putbuff.c +++ b/c/src/tests/sptests/sp13/putbuff.c @@ -20,9 +20,21 @@ #include "system.h" +#define MESSAGE_SIZE (4) + void Put_buffer( long *buffer ) { + int i; +/* printf( "%16s", (char *)buffer ); +*/ + for ( i=0 ; i< MESSAGE_SIZE ; i++ ) { + printf( "%c%c%c%c", (char) (buffer[i] >> 24), + (char) (buffer[i] >> 16 & 0xff), + (char) (buffer[i] >> 8 & 0xff), + (char) (buffer[i] >> 0 & 0xff) ); + } + } diff --git a/c/src/tests/sptests/sp13/system.h b/c/src/tests/sptests/sp13/system.h index 49b6d6feaf..fea6a652a6 100644 --- a/c/src/tests/sptests/sp13/system.h +++ b/c/src/tests/sptests/sp13/system.h @@ -44,11 +44,10 @@ rtems_task Task_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 10 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/c/src/tests/sptests/sp13/task1.c b/c/src/tests/sptests/sp13/task1.c index 859c3d46ab..015259b0f0 100644 --- a/c/src/tests/sptests/sp13/task1.c +++ b/c/src/tests/sptests/sp13/task1.c @@ -25,6 +25,8 @@ char big_receive_buffer[2048]; long buffer[ 4 ]; +#define MESSAGE_SIZE (sizeof(long) * 4) + void dope_buffer(unsigned char *buff, int buff_size, unsigned32 v) @@ -64,12 +66,12 @@ rtems_task Task_1( Fill_buffer( "BUFFER 1 TO Q 1", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1" ); - status = rtems_message_queue_send( Queue_id[ 1 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); Fill_buffer( "BUFFER 2 TO Q 1", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1" ); - status = rtems_message_queue_send( Queue_id[ 1 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" ); @@ -78,7 +80,7 @@ rtems_task Task_1( Fill_buffer( "BUFFER 3 TO Q 1", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 1" ); - status = rtems_message_queue_send( Queue_id[ 1 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 1 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" ); @@ -89,7 +91,7 @@ rtems_test_pause(); Fill_buffer( "BUFFER 1 TO Q 2", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 2" ); - status = rtems_message_queue_send( Queue_id[ 2 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 2 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts_nocr( "TA1 - rtems_message_queue_receive - receive from queue 1 - " ); @@ -112,7 +114,7 @@ rtems_test_pause(); Fill_buffer( "BUFFER 1 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( "TA1 - rtems_task_wake_after - sleep 5 seconds" ); @@ -123,22 +125,22 @@ rtems_test_pause(); Fill_buffer( "BUFFER 2 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); Fill_buffer( "BUFFER 3 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); Fill_buffer( "BUFFER 4 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 4 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); Fill_buffer( "BUFFER 5 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_urgent - BUFFER 5 TO Q 3" ); - status = rtems_message_queue_urgent( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_urgent( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_urgent" ); for ( index = 1 ; index <= 4 ; index++ ) { @@ -161,7 +163,7 @@ rtems_test_pause(); Fill_buffer( "BUFFER 3 TO Q 2", buffer ); puts( "TA1 - rtems_message_queue_urgent - BUFFER 3 TO Q 2" ); - status = rtems_message_queue_urgent( Queue_id[ 2 ], buffer, 16 ); + status = rtems_message_queue_urgent( Queue_id[ 2 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_urgent" ); puts( @@ -188,7 +190,7 @@ rtems_test_pause(); Fill_buffer( "BUFFER 3 TO Q 2", buffer ); puts( "TA1 - rtems_message_queue_urgent - BUFFER 3 TO Q 2" ); - status = rtems_message_queue_urgent( Queue_id[ 2 ], buffer, 16 ); + status = rtems_message_queue_urgent( Queue_id[ 2 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_urgent" ); puts( "TA1 - rtems_message_queue_delete - delete queue 2" ); @@ -205,12 +207,12 @@ rtems_test_pause(); Fill_buffer( "BUFFER 1 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 1 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); Fill_buffer( "BUFFER 2 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 2 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); /* this broadcast should have no effect on the queue */ @@ -231,7 +233,7 @@ rtems_test_pause(); Fill_buffer( "BUFFER 3 TO Q 3", buffer ); puts( "TA1 - rtems_message_queue_send - BUFFER 3 TO Q 3" ); - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( "TA1 - rtems_message_queue_flush - Q 3" ); @@ -240,7 +242,7 @@ rtems_test_pause(); puts( "TA1 - rtems_message_queue_send until all message buffers consumed" ); while ( FOREVER ) { - status = rtems_message_queue_send( Queue_id[ 3 ], buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 3 ], buffer, MESSAGE_SIZE ); if ( status == RTEMS_TOO_MANY ) break; directive_failed( status, "rtems_message_queue_send loop" ); } diff --git a/c/src/tests/sptests/sp13/task2.c b/c/src/tests/sptests/sp13/task2.c index c3e117fae3..258a036f8c 100644 --- a/c/src/tests/sptests/sp13/task2.c +++ b/c/src/tests/sptests/sp13/task2.c @@ -20,6 +20,8 @@ #include "system.h" +#define MESSAGE_SIZE (sizeof(long) * 4) + rtems_task Task_2( rtems_task_argument argument ) @@ -34,7 +36,7 @@ rtems_task Task_2( ); status = rtems_message_queue_receive( Queue_id[ 1 ], - (long (*)[4])buffer, + buffer, &size, RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT @@ -50,7 +52,7 @@ rtems_task Task_2( ); status = rtems_message_queue_receive( Queue_id[ 1 ], - (long (*)[4])buffer, + buffer, &size, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT @@ -66,7 +68,7 @@ rtems_task Task_2( ); status = rtems_message_queue_receive( Queue_id[ 1 ], - (long (*)[4])buffer, + buffer, &size, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT @@ -86,7 +88,7 @@ rtems_task Task_2( ); status = rtems_message_queue_receive( Queue_id[ 2 ], - (long (*)[4])buffer, + buffer, &size, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT @@ -100,7 +102,7 @@ rtems_task Task_2( puts( "TA2 - rtems_message_queue_send - BUFFER 2 TO Q 2" ); directive_failed( status, "rtems_message_queue_send" ); - status = rtems_message_queue_send( Queue_id[ 2 ], (long (*)[4])buffer, 16 ); + status = rtems_message_queue_send( Queue_id[ 2 ], buffer, MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); puts( @@ -109,7 +111,7 @@ rtems_task Task_2( ); status = rtems_message_queue_receive( Queue_id[ 1 ], - (long (*)[4])buffer, + buffer, &size, RTEMS_DEFAULT_OPTIONS, 10 * TICKS_PER_SECOND @@ -125,7 +127,7 @@ rtems_task Task_2( ); status = rtems_message_queue_receive( Queue_id[ 3 ], - (long (*)[4])buffer, + buffer, &size, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT diff --git a/c/src/tests/sptests/sp14/Makefile.am b/c/src/tests/sptests/sp14/Makefile.am index 223bb0e03e..1687f9c0bf 100644 --- a/c/src/tests/sptests/sp14/Makefile.am +++ b/c/src/tests/sptests/sp14/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c asr.c task1.c task2.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp14/system.h b/c/src/tests/sptests/sp14/system.h index 48de462729..2483902dcb 100644 --- a/c/src/tests/sptests/sp14/system.h +++ b/c/src/tests/sptests/sp14/system.h @@ -40,11 +40,10 @@ rtems_task Task_2( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 3 #define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/c/src/tests/sptests/sp15/Makefile.am b/c/src/tests/sptests/sp15/Makefile.am index 453aad182f..aeebd7e9b8 100644 --- a/c/src/tests/sptests/sp15/Makefile.am +++ b/c/src/tests/sptests/sp15/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp15/system.h b/c/src/tests/sptests/sp15/system.h index f69ce5eb4c..be434159c3 100644 --- a/c/src/tests/sptests/sp15/system.h +++ b/c/src/tests/sptests/sp15/system.h @@ -27,11 +27,10 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_PARTITIONS 2 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/c/src/tests/sptests/sp16/Makefile.am b/c/src/tests/sptests/sp16/Makefile.am index 87f9279f15..a5299f2ed0 100644 --- a/c/src/tests/sptests/sp16/Makefile.am +++ b/c/src/tests/sptests/sp16/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c task4.c task5.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp16/system.h b/c/src/tests/sptests/sp16/system.h index d3a3922382..fc218652b2 100644 --- a/c/src/tests/sptests/sp16/system.h +++ b/c/src/tests/sptests/sp16/system.h @@ -43,11 +43,10 @@ rtems_task Task5( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_MAXIMUM_REGIONS 4 #define CONFIGURE_TICKS_PER_TIMESLICE 100 diff --git a/c/src/tests/sptests/sp17/Makefile.am b/c/src/tests/sptests/sp17/Makefile.am index d9697ea5a6..9ede8951fd 100644 --- a/c/src/tests/sptests/sp17/Makefile.am +++ b/c/src/tests/sptests/sp17/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c asr.c task1.c task2.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp17/system.h b/c/src/tests/sptests/sp17/system.h index e5f88b9fe2..b86cc5ff09 100644 --- a/c/src/tests/sptests/sp17/system.h +++ b/c/src/tests/sptests/sp17/system.h @@ -35,11 +35,10 @@ rtems_task Task_2( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 3 #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(25) #define CONFIGURE_TICKS_PER_TIMESLICE 1000 diff --git a/c/src/tests/sptests/sp19/Makefile.am b/c/src/tests/sptests/sp19/Makefile.am index 45c43db672..0b7e960f03 100644 --- a/c/src/tests/sptests/sp19/Makefile.am +++ b/c/src/tests/sptests/sp19/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c first.c fptask.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h fptest.h inttest.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp19/system.h b/c/src/tests/sptests/sp19/system.h index 026d0a2c9b..bfece91ec1 100644 --- a/c/src/tests/sptests/sp19/system.h +++ b/c/src/tests/sptests/sp19/system.h @@ -35,12 +35,12 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST - #define CONFIGURE_INIT_TASK_ATTRIBUTES RTEMS_FLOATING_POINT -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 7 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/sptests/sp20/Makefile.am b/c/src/tests/sptests/sp20/Makefile.am index 74db12b302..9e15764811 100644 --- a/c/src/tests/sptests/sp20/Makefile.am +++ b/c/src/tests/sptests/sp20/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c getall.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp20/system.h b/c/src/tests/sptests/sp20/system.h index 03b6084606..868fd60ae5 100644 --- a/c/src/tests/sptests/sp20/system.h +++ b/c/src/tests/sptests/sp20/system.h @@ -35,15 +35,14 @@ void Get_all_counters( void ); /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 6 +#define CONFIGURE_MAXIMUM_PERIODS 10 #define CONFIGURE_INIT_TASK_PRIORITY 10 #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_DEFAULT_MODES -#define CONFIGURE_MAXIMUM_PERIODS 10 - #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXTRA_TASK_STACKS (15 * RTEMS_MINIMUM_STACK_SIZE) diff --git a/c/src/tests/sptests/sp21/Makefile.am b/c/src/tests/sptests/sp21/Makefile.am index 6d7cfa66c0..6862e94301 100644 --- a/c/src/tests/sptests/sp21/Makefile.am +++ b/c/src/tests/sptests/sp21/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp21/system.h b/c/src/tests/sptests/sp21/system.h index fe38835aa0..483dbcd2dc 100644 --- a/c/src/tests/sptests/sp21/system.h +++ b/c/src/tests/sptests/sp21/system.h @@ -27,11 +27,11 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_STUB_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/sptests/sp22/Makefile.am b/c/src/tests/sptests/sp22/Makefile.am index af0558eb24..986700ac57 100644 --- a/c/src/tests/sptests/sp22/Makefile.am +++ b/c/src/tests/sptests/sp22/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c prtime.c delay.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp22/system.h b/c/src/tests/sptests/sp22/system.h index 102be71e0c..4782a88979 100644 --- a/c/src/tests/sptests/sp22/system.h +++ b/c/src/tests/sptests/sp22/system.h @@ -34,11 +34,10 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_TIMERS 2 #define CONFIGURE_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2) diff --git a/c/src/tests/sptests/sp23/Makefile.am b/c/src/tests/sptests/sp23/Makefile.am index 58d175b655..4f05ae56b0 100644 --- a/c/src/tests/sptests/sp23/Makefile.am +++ b/c/src/tests/sptests/sp23/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp23/system.h b/c/src/tests/sptests/sp23/system.h index 24679a900a..3098ddb0be 100644 --- a/c/src/tests/sptests/sp23/system.h +++ b/c/src/tests/sptests/sp23/system.h @@ -27,12 +27,11 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER - -#define CONFIGURE_MAXIMUM_PORTS 1 +#define CONFIGURE_MAXIMUM_TASKS 2 +#define CONFIGURE_MAXIMUM_PORTS 1 #define CONFIGURE_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2) #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/sptests/sp24/Makefile.am b/c/src/tests/sptests/sp24/Makefile.am index a0b836b0f4..db1582b474 100644 --- a/c/src/tests/sptests/sp24/Makefile.am +++ b/c/src/tests/sptests/sp24/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c resume.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp24/system.h b/c/src/tests/sptests/sp24/system.h index e048dc5722..1cb57dcf40 100644 --- a/c/src/tests/sptests/sp24/system.h +++ b/c/src/tests/sptests/sp24/system.h @@ -32,11 +32,10 @@ rtems_task Task_1_through_3( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_MAXIMUM_TIMERS 3 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/sptests/sp25/Makefile.am b/c/src/tests/sptests/sp25/Makefile.am index a785691f09..8b445734d6 100644 --- a/c/src/tests/sptests/sp25/Makefile.am +++ b/c/src/tests/sptests/sp25/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp25/sp25.scn b/c/src/tests/sptests/sp25/sp25.scn index 090bc35856..d15cc46897 100644 --- a/c/src/tests/sptests/sp25/sp25.scn +++ b/c/src/tests/sptests/sp25/sp25.scn @@ -1,29 +1,32 @@ +NOTE: Addresses vary between BSPs. Please check that the addresses + printed are reasonable for your target board and that the + segments noted as being returned were allocated from the region. *** TEST 25 *** TA1 - rtems_region_ident - 0x24010002 TA1 - rtems_region_get_segment - wait on 64 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000f9b8 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 128 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000f930 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 256 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000f828 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 512 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000f620 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 1024 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000f218 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 2048 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000ea10 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 4096 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000da08 +TA1 - got segment from region 1 - 0xXXXXXXXX TA1 - rtems_region_get_segment - wait on 8192 byte segment from region 1 -TA1 - got segment from region 1 - 0x0000ba00 +TA1 - got segment from region 1 - 0xXXXXXXXX <pause> -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f828 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f620 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f9b8 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f930 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000da08 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000ea10 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000ba00 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x0000f218 +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX +TA1 - rtems_region_return_segment - return segment to region 1 - 0xXXXXXXXX TA1 - rtems_region_delete - walks heap if debug enabled *** END OF TEST 25 *** diff --git a/c/src/tests/sptests/sp25/system.h b/c/src/tests/sptests/sp25/system.h index 05b90c4164..d2dfd939a7 100644 --- a/c/src/tests/sptests/sp25/system.h +++ b/c/src/tests/sptests/sp25/system.h @@ -27,11 +27,10 @@ rtems_task Task_1( /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_REGIONS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/sptests/sp26/Makefile.am b/c/src/tests/sptests/sp26/Makefile.am index 754b94cef0..9903c69425 100644 --- a/c/src/tests/sptests/sp26/Makefile.am +++ b/c/src/tests/sptests/sp26/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp26/system.h b/c/src/tests/sptests/sp26/system.h index 5f13e865b3..dcd0904759 100644 --- a/c/src/tests/sptests/sp26/system.h +++ b/c/src/tests/sptests/sp26/system.h @@ -25,11 +25,10 @@ void task1(void); /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 5 #define CONFIGURE_MAXIMUM_REGIONS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE @@ -40,15 +39,7 @@ void task1(void); TEST_EXTERN rtems_id Task_id[ 6 ]; /* array of task ids */ TEST_EXTERN rtems_name Task_name[ 6 ]; /* array of task names */ -TEST_EXTERN rtems_id Region_id[ 2 ]; /* array of region ids */ -TEST_EXTERN rtems_name Region_name[ 2 ]; /* array of region names */ - -TEST_EXTERN rtems_unsigned8 Area_1[64000] CPU_STRUCTURE_ALIGNMENT; #define BASE_PRIORITY 140 -#define Put_address_from_area_1( _to_be_printed ) \ - printf( "0x%08lx", \ - (unsigned long) ((rtems_unsigned8 *)(_to_be_printed) - Area_1 ) ) - /* end of include file */ diff --git a/c/src/tests/sptests/sp27/Makefile.am b/c/src/tests/sptests/sp27/Makefile.am index 1cb20586dd..11e5b2b073 100644 --- a/c/src/tests/sptests/sp27/Makefile.am +++ b/c/src/tests/sptests/sp27/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/tests/sptests/sp27/init.c b/c/src/tests/sptests/sp27/init.c index 4ae5befb78..d3353e6de3 100644 --- a/c/src/tests/sptests/sp27/init.c +++ b/c/src/tests/sptests/sp27/init.c @@ -10,8 +10,10 @@ rtems_task Init (rtems_task_argument argument); #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 6 #define CONFIGURE_MICROSECONDS_PER_TICK 52429 @@ -52,7 +54,7 @@ starttask (int arg) rtems_task_set_priority (RTEMS_SELF, RTEMS_CURRENT_PRIORITY, &priority); sc = rtems_task_create (rtems_build_name ('S', 'R', 'V', arg + 'A'), priority, - 10000, + RTEMS_MINIMUM_STACK_SIZE, RTEMS_PREEMPT|RTEMS_NO_TIMESLICE|RTEMS_NO_ASR|RTEMS_INTERRUPT_LEVEL(0), RTEMS_NO_FLOATING_POINT|RTEMS_LOCAL, &tid); diff --git a/c/src/tests/sptests/sp28/Makefile.am b/c/src/tests/sptests/sp28/Makefile.am index 5f966b4eb2..af4a0834d5 100644 --- a/c/src/tests/sptests/sp28/Makefile.am +++ b/c/src/tests/sptests/sp28/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/tests/sptests/sp28/init.c b/c/src/tests/sptests/sp28/init.c index f6f7d70218..e2c5a40027 100644 --- a/c/src/tests/sptests/sp28/init.c +++ b/c/src/tests/sptests/sp28/init.c @@ -7,10 +7,11 @@ rtems_task Init(rtems_task_argument argument); -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MAXIMUM_USER_EXTENSIONS 2 +#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_MICROSECONDS_PER_TICK 52429 @@ -23,6 +24,8 @@ rtems_task Init(rtems_task_argument argument); #include <stdio.h> volatile void *taskvar; +volatile int nRunning; +volatile int nDeleted; rtems_task subtask (rtems_task_argument arg) @@ -31,7 +34,10 @@ subtask (rtems_task_argument arg) int i; rtems_status_code sc; - sc = rtems_task_variable_add (RTEMS_SELF, &taskvar, NULL); + nRunning++; + while (nRunning != 3) + rtems_task_wake_after (0); + sc = rtems_task_variable_add (RTEMS_SELF, (void **)&taskvar, NULL); if (sc != RTEMS_SUCCESSFUL) { printf ("Can't add task variable: %s\n", rtems_status_text (sc)); rtems_task_suspend (RTEMS_SELF); @@ -47,23 +53,37 @@ subtask (rtems_task_argument arg) rtems_task_suspend (RTEMS_SELF); } } - sc = rtems_task_variable_delete (RTEMS_SELF, &taskvar); + sc = rtems_task_variable_delete (RTEMS_SELF, (void **)&taskvar); + nDeleted++; if (sc != RTEMS_SUCCESSFUL) { printf ("Can't delete task variable: %s\n", rtems_status_text (sc)); + nRunning--; + rtems_task_suspend (RTEMS_SELF); + } + if ((int)taskvar == localvar) { + printf ("Task:%d deleted taskvar:%d localvar:%d\n", arg, (int)taskvar, localvar); + nRunning--; rtems_task_suspend (RTEMS_SELF); } - for (i = 0 ; ; i++) { + while (nDeleted != 3) + rtems_task_wake_after (0); + for (i = 0 ; i < 1000 ; i++) { taskvar = (void *)(localvar = 100 * arg); rtems_task_wake_after (0); + if (nRunning <= 1) + break; if ((int)taskvar == localvar) { printf ("Task:%d taskvar:%d localvar:%d\n", arg, (int)taskvar, localvar); + nRunning--; rtems_task_suspend (RTEMS_SELF); } - if ((arg == 3) && (i == 100)) { - printf ("Task variables test succeeded.\n"); - exit (0); - } } + nRunning--; + while (nRunning) + rtems_task_wake_after (0); + printf ("Task variables test complete.\n"); + puts ("*** END OF TEST SP28 ***" ); + exit (0); } void @@ -74,7 +94,7 @@ starttask (int arg) sc = rtems_task_create (rtems_build_name ('S', 'R', 'V', arg + 'A'), 100, - 10000, + RTEMS_MINIMUM_STACK_SIZE, RTEMS_PREEMPT|RTEMS_NO_TIMESLICE|RTEMS_NO_ASR|RTEMS_INTERRUPT_LEVEL(0), RTEMS_NO_FLOATING_POINT|RTEMS_LOCAL, &tid); @@ -92,6 +112,10 @@ starttask (int arg) rtems_task Init (rtems_task_argument ignored) { + + puts ("*** START OF TEST SP28 ***" ); + puts ("Task variables test begins. Any output between\n"); + puts ("this line and the `Task variables test complete' line indicates an error.\n"); starttask (1); starttask (2); starttask (3); diff --git a/c/src/tests/sptests/sp29/Makefile.am b/c/src/tests/sptests/sp29/Makefile.am index e34dfda22c..653acadd97 100644 --- a/c/src/tests/sptests/sp29/Makefile.am +++ b/c/src/tests/sptests/sp29/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/tests/sptests/sp29/init.c b/c/src/tests/sptests/sp29/init.c index bf866bd32e..96daee4c3f 100644 --- a/c/src/tests/sptests/sp29/init.c +++ b/c/src/tests/sptests/sp29/init.c @@ -10,8 +10,10 @@ rtems_task Init (rtems_task_argument argument); #define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 +#define CONFIGURE_MAXIMUM_SEMAPHORES 2 #define CONFIGURE_INIT diff --git a/c/src/tests/sptests/spfatal/Makefile.am b/c/src/tests/sptests/spfatal/Makefile.am index 7e2daafc95..ba6e2b4f89 100644 --- a/c/src/tests/sptests/spfatal/Makefile.am +++ b/c/src/tests/sptests/spfatal/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c puterr.c fatal.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/spfatal/system.h b/c/src/tests/sptests/spfatal/system.h index 091a07476d..da32fac308 100644 --- a/c/src/tests/sptests/spfatal/system.h +++ b/c/src/tests/sptests/spfatal/system.h @@ -52,10 +52,8 @@ extern rtems_extensions_table initial_extensions; Fatal_extension /* fatal */ \ } -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(0) #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/c/src/tests/sptests/spsize/Makefile.am b/c/src/tests/sptests/spsize/Makefile.am index 4e7d4aca2d..420132cf74 100644 --- a/c/src/tests/sptests/spsize/Makefile.am +++ b/c/src/tests/sptests/spsize/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c getint.c size.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/spsize/system.h b/c/src/tests/sptests/spsize/system.h index 4a432760b0..b29a466c98 100644 --- a/c/src/tests/sptests/spsize/system.h +++ b/c/src/tests/sptests/spsize/system.h @@ -29,11 +29,10 @@ int getint( void ); /* configuration information */ -#define CONFIGURE_SPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #include <confdefs.h> diff --git a/c/src/tests/support/include/Makefile.am b/c/src/tests/support/include/Makefile.am index 72f0f3c837..d5d258b558 100644 --- a/c/src/tests/support/include/Makefile.am +++ b/c/src/tests/support/include/Makefile.am @@ -4,26 +4,20 @@ AUTOMAKE_OPTIONS = foreign 1.4 -project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ +project_bspdir = $(PROJECT_ROOT)/@RTEMS_BSP@ noinst_HEADERS = tmacros.h -TMPINSTALLDIRS=$(project_bspdir)/lib/include +TMPINSTALLFILES = $(project_bspdir)/lib/include \ + $(project_bspdir)/lib/include/tmacros.h -$(TMPINSTALLDIRS): +$(project_bspdir)/lib/include: $(mkinstalldirs) $@ - -TMPINSTALLFILES = $(project_bspdir)/lib/include/tmacros.h - $(project_bspdir)/lib/include/tmacros.h: tmacros.h $(INSTALL_DATA) $< $@ -CLEANFILES = $(TMPINSTALLFILES) - -install-tmp: $(TMPINSTALLFILES) +CLEANFILES = $(project_bspdir)/lib/include/tmacros.h -all: install-tmp -debug: install-tmp -profile: install-tmp +all-local: $(TMPINSTALLFILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/tests/support/stubdr/Makefile.am b/c/src/tests/support/stubdr/Makefile.am index 5607df0e2d..a0978a7c83 100644 --- a/c/src/tests/support/stubdr/Makefile.am +++ b/c/src/tests/support/stubdr/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -18,9 +18,7 @@ OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg -TMPINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%=$(PROJECT_INCLUDE)/%) +TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) $(PROJECT_INCLUDE): @$(mkinstalldirs) $@ diff --git a/c/src/tests/support/wrapup/Makefile.am b/c/src/tests/support/wrapup/Makefile.am index 752951613f..bb6a1e62e0 100644 --- a/c/src/tests/support/wrapup/Makefile.am +++ b/c/src/tests/support/wrapup/Makefile.am @@ -1,10 +1,10 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -LIBNAME=libtest +LIBNAME = libtest LIB = $(ARCH)/$(LIBNAME).a GENERIC_FILES = stubdr @@ -19,8 +19,7 @@ include $(top_srcdir)/../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a $(LIB): ${OBJS} $(make-library) @@ -28,6 +27,6 @@ $(LIB): ${OBJS} $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ -all: ${ARCH} $(TMPINSTALL_FILES) +all-local: ${ARCH} $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/tests/tmitrontests/tmitronsem01/Makefile.am b/c/src/tests/tmitrontests/tmitronsem01/Makefile.am index 2cb351e2a9..07ee637113 100644 --- a/c/src/tests/tmitrontests/tmitronsem01/Makefile.am +++ b/c/src/tests/tmitrontests/tmitronsem01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tmitronsem01 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmitrontests/tmitronsem01/system.h b/c/src/tests/tmitrontests/tmitronsem01/system.h index 87f3612e67..97ba89f9f2 100644 --- a/c/src/tests/tmitrontests/tmitronsem01/system.h +++ b/c/src/tests/tmitrontests/tmitronsem01/system.h @@ -23,11 +23,12 @@ void ITRON_Init( void ); /* configuration information */ -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_ITRON_INIT_TASK_TABLE +#define CONFIGURE_MAXIMUM_ITRON_TASKS 1 #define CONFIGURE_MAXIMUM_ITRON_SEMAPHORES 100 +#define CONFIGURE_ITRON_INIT_TASK_TABLE #include <confdefs.h> diff --git a/c/src/tests/tmtests/Makefile.am b/c/src/tests/tmtests/Makefile.am index 57d15492c6..6e9287a926 100644 --- a/c/src/tests/tmtests/Makefile.am +++ b/c/src/tests/tmtests/Makefile.am @@ -5,9 +5,9 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -SUBDIRS = include tmck tmoverhd tm01 tm02 tm03 tm04 tm05 tm06 tm07 tm08 \ - tm09 tm10 tm11 tm12 tm13 tm14 tm15 tm16 tm17 tm18 tm19 tm20 tm21 tm22 \ - tm23 tm24 tm25 tm26 tm27 tm28 tm29 +SUBDIRS = include tmck tmoverhd tm01 tm02 tm03 tm04 tm05 tm06 tm07 tm08 tm09 \ + tm10 tm11 tm12 tm13 tm14 tm15 tm16 tm17 tm18 tm19 tm20 tm21 tm22 tm23 \ + tm24 tm25 tm26 tm27 tm28 tm29 EXTRA_DIST = tmtests.am diff --git a/c/src/tests/tmtests/tm01/Makefile.am b/c/src/tests/tmtests/tm01/Makefile.am index cec68ff0b8..7fae5e28c7 100644 --- a/c/src/tests/tmtests/tm01/Makefile.am +++ b/c/src/tests/tmtests/tm01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm01 MANAGERS = io semaphore @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm01/system.h b/c/src/tests/tmtests/tm01/system.h index 891ad109c3..23125086dd 100644 --- a/c/src/tests/tmtests/tm01/system.h +++ b/c/src/tests/tmtests/tm01/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_SEMAPHORES 1 diff --git a/c/src/tests/tmtests/tm02/Makefile.am b/c/src/tests/tmtests/tm02/Makefile.am index 972dce7e71..ecaddf4f81 100644 --- a/c/src/tests/tmtests/tm02/Makefile.am +++ b/c/src/tests/tmtests/tm02/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm02 MANAGERS = io semaphore @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm02/system.h b/c/src/tests/tmtests/tm02/system.h index a2c701c05c..9219076f58 100644 --- a/c/src/tests/tmtests/tm02/system.h +++ b/c/src/tests/tmtests/tm02/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_TIMERS 110 diff --git a/c/src/tests/tmtests/tm03/Makefile.am b/c/src/tests/tmtests/tm03/Makefile.am index 6f62d92019..f6b8cd86ea 100644 --- a/c/src/tests/tmtests/tm03/Makefile.am +++ b/c/src/tests/tmtests/tm03/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm03 MANAGERS = io semaphore @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm03/system.h b/c/src/tests/tmtests/tm03/system.h index a2c701c05c..9219076f58 100644 --- a/c/src/tests/tmtests/tm03/system.h +++ b/c/src/tests/tmtests/tm03/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_TIMERS 110 diff --git a/c/src/tests/tmtests/tm04/Makefile.am b/c/src/tests/tmtests/tm04/Makefile.am index ba0f3b8b8d..9dc5b10e5c 100644 --- a/c/src/tests/tmtests/tm04/Makefile.am +++ b/c/src/tests/tmtests/tm04/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm04 MANAGERS = io semaphore @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm04/system.h b/c/src/tests/tmtests/tm04/system.h index ef4e319c73..d3be287997 100644 --- a/c/src/tests/tmtests/tm04/system.h +++ b/c/src/tests/tmtests/tm04/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_SEMAPHORES 1 diff --git a/c/src/tests/tmtests/tm05/Makefile.am b/c/src/tests/tmtests/tm05/Makefile.am index 9650859f45..fa80ba3799 100644 --- a/c/src/tests/tmtests/tm05/Makefile.am +++ b/c/src/tests/tmtests/tm05/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm05 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm05/system.h b/c/src/tests/tmtests/tm05/system.h index a2c701c05c..9219076f58 100644 --- a/c/src/tests/tmtests/tm05/system.h +++ b/c/src/tests/tmtests/tm05/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_TIMERS 110 diff --git a/c/src/tests/tmtests/tm06/Makefile.am b/c/src/tests/tmtests/tm06/Makefile.am index 034bce6b49..24a6f25988 100644 --- a/c/src/tests/tmtests/tm06/Makefile.am +++ b/c/src/tests/tmtests/tm06/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm06 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm06/system.h b/c/src/tests/tmtests/tm06/system.h index a2c701c05c..9219076f58 100644 --- a/c/src/tests/tmtests/tm06/system.h +++ b/c/src/tests/tmtests/tm06/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_TIMERS 110 diff --git a/c/src/tests/tmtests/tm07/Makefile.am b/c/src/tests/tmtests/tm07/Makefile.am index cdec5806be..0efde2c609 100644 --- a/c/src/tests/tmtests/tm07/Makefile.am +++ b/c/src/tests/tmtests/tm07/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm07 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm07/system.h b/c/src/tests/tmtests/tm07/system.h index a2c701c05c..9219076f58 100644 --- a/c/src/tests/tmtests/tm07/system.h +++ b/c/src/tests/tmtests/tm07/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_TIMERS 110 diff --git a/c/src/tests/tmtests/tm08/Makefile.am b/c/src/tests/tmtests/tm08/Makefile.am index 66eefd2380..4a1fb4c0bf 100644 --- a/c/src/tests/tmtests/tm08/Makefile.am +++ b/c/src/tests/tmtests/tm08/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm08 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm08/system.h b/c/src/tests/tmtests/tm08/system.h index a2c701c05c..9219076f58 100644 --- a/c/src/tests/tmtests/tm08/system.h +++ b/c/src/tests/tmtests/tm08/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_TIMERS 110 diff --git a/c/src/tests/tmtests/tm09/Makefile.am b/c/src/tests/tmtests/tm09/Makefile.am index 205a989fec..3770facbfb 100644 --- a/c/src/tests/tmtests/tm09/Makefile.am +++ b/c/src/tests/tmtests/tm09/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm09 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm09/system.h b/c/src/tests/tmtests/tm09/system.h index b22856dafc..f5b30a1d04 100644 --- a/c/src/tests/tmtests/tm09/system.h +++ b/c/src/tests/tmtests/tm09/system.h @@ -26,11 +26,10 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/c/src/tests/tmtests/tm09/task1.c b/c/src/tests/tmtests/tm09/task1.c index 27bbc0931e..34ce8b5a11 100644 --- a/c/src/tests/tmtests/tm09/task1.c +++ b/c/src/tests/tmtests/tm09/task1.c @@ -47,6 +47,8 @@ rtems_task Init( directive_failed( status, "rtems_task_delete of RTEMS_SELF" ); } +#define MESSAGE_SIZE (sizeof(long) * 4) + rtems_task Test_task ( rtems_task_argument argument ) @@ -55,7 +57,7 @@ rtems_task Test_task ( rtems_message_queue_create( 1, OPERATION_COUNT, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id ); @@ -135,7 +137,7 @@ void queue_test() Timer_initialize(); for ( index=1 ; index <= OPERATION_COUNT ; index++ ) - (void) rtems_message_queue_send( Queue_id, (long (*)[4])buffer, 16 ); + (void) rtems_message_queue_send( Queue_id, buffer, MESSAGE_SIZE ); send_time += Read_timer(); Timer_initialize(); @@ -151,7 +153,7 @@ void queue_test() Timer_initialize(); for ( index=1 ; index <= OPERATION_COUNT ; index++ ) - (void) rtems_message_queue_urgent( Queue_id, (long (*)[4])buffer, 16 ); + (void) rtems_message_queue_urgent( Queue_id, buffer, MESSAGE_SIZE ); urgent_time += Read_timer(); Timer_initialize(); @@ -173,7 +175,7 @@ void queue_test() status = rtems_message_queue_send( Queue_id, (long (*)[4])buffer, - 16 + MESSAGE_SIZE ); directive_failed( status, "rtems_message_queue_send" ); diff --git a/c/src/tests/tmtests/tm10/Makefile.am b/c/src/tests/tmtests/tm10/Makefile.am index 72052067af..9de2e37108 100644 --- a/c/src/tests/tmtests/tm10/Makefile.am +++ b/c/src/tests/tmtests/tm10/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm10 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm10/system.h b/c/src/tests/tmtests/tm10/system.h index ebdb1863a7..964ccc39c2 100644 --- a/c/src/tests/tmtests/tm10/system.h +++ b/c/src/tests/tmtests/tm10/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 110 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/tmtests/tm11/Makefile.am b/c/src/tests/tmtests/tm11/Makefile.am index c12ecf0788..b2d6f95a91 100644 --- a/c/src/tests/tmtests/tm11/Makefile.am +++ b/c/src/tests/tmtests/tm11/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm11 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm11/system.h b/c/src/tests/tmtests/tm11/system.h index bed2533a81..d3f219713a 100644 --- a/c/src/tests/tmtests/tm11/system.h +++ b/c/src/tests/tmtests/tm11/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/tmtests/tm11/task1.c b/c/src/tests/tmtests/tm11/task1.c index 0afc1b9590..0ff58e4c87 100644 --- a/c/src/tests/tmtests/tm11/task1.c +++ b/c/src/tests/tmtests/tm11/task1.c @@ -58,6 +58,8 @@ void Init( directive_failed( status, "rtems_task_delete of RTEMS_SELF" ); } +#define MESSAGE_SIZE (sizeof(long) * 4) + rtems_task test_init( rtems_task_argument argument ) @@ -76,7 +78,7 @@ rtems_task test_init( status = rtems_message_queue_create( rtems_build_name( 'M', 'Q', '1', ' ' ), OPERATION_COUNT, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id ); @@ -105,7 +107,7 @@ rtems_task test_init( } Timer_initialize(); - (void) rtems_message_queue_send( Queue_id, (long (*)[4]) Buffer, 16 ); + (void) rtems_message_queue_send( Queue_id, Buffer, MESSAGE_SIZE ); } rtems_task Middle_tasks( diff --git a/c/src/tests/tmtests/tm12/Makefile.am b/c/src/tests/tmtests/tm12/Makefile.am index 213f72271e..1895c02f35 100644 --- a/c/src/tests/tmtests/tm12/Makefile.am +++ b/c/src/tests/tmtests/tm12/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm12 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm12/system.h b/c/src/tests/tmtests/tm12/system.h index bed2533a81..d3f219713a 100644 --- a/c/src/tests/tmtests/tm12/system.h +++ b/c/src/tests/tmtests/tm12/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/tmtests/tm12/task1.c b/c/src/tests/tmtests/tm12/task1.c index 7e57b29f12..5b67e59a19 100644 --- a/c/src/tests/tmtests/tm12/task1.c +++ b/c/src/tests/tmtests/tm12/task1.c @@ -29,6 +29,7 @@ rtems_task Low_tasks( rtems_task_argument argument ); +#define MESSAGE_SIZE (sizeof(long) * 4) rtems_task Init( rtems_task_argument argument @@ -72,7 +73,7 @@ rtems_task test_init( status = rtems_message_queue_create( rtems_build_name( 'M', 'Q', '1', ' ' ), OPERATION_COUNT, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id ); @@ -114,7 +115,7 @@ rtems_task High_task( Timer_initialize(); for ( index=1 ; index <= OPERATION_COUNT ; index++ ) - (void) rtems_message_queue_send( Queue_id, (long (*)[4]) Buffer, 16 ); + (void) rtems_message_queue_send( Queue_id, Buffer, MESSAGE_SIZE ); end_time = Read_timer(); put_time( diff --git a/c/src/tests/tmtests/tm13/Makefile.am b/c/src/tests/tmtests/tm13/Makefile.am index caaf71f8b3..503f9af375 100644 --- a/c/src/tests/tmtests/tm13/Makefile.am +++ b/c/src/tests/tmtests/tm13/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm13 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm13/system.h b/c/src/tests/tmtests/tm13/system.h index bed2533a81..d3f219713a 100644 --- a/c/src/tests/tmtests/tm13/system.h +++ b/c/src/tests/tmtests/tm13/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/tmtests/tm13/task1.c b/c/src/tests/tmtests/tm13/task1.c index 317b1f1805..0b2afc8571 100644 --- a/c/src/tests/tmtests/tm13/task1.c +++ b/c/src/tests/tmtests/tm13/task1.c @@ -29,6 +29,8 @@ rtems_task High_task( rtems_task_argument argument ); +#define MESSAGE_SIZE (sizeof(long) * 4) + void Init( rtems_task_argument argument ) @@ -75,7 +77,7 @@ rtems_task test_init( status = rtems_message_queue_create( rtems_build_name( 'M', 'Q', '1', ' ' ), OPERATION_COUNT, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id ); @@ -104,7 +106,7 @@ rtems_task test_init( } Timer_initialize(); - (void) rtems_message_queue_urgent( Queue_id, (long (*)[4]) Buffer, 16 ); + (void) rtems_message_queue_urgent( Queue_id, Buffer, MESSAGE_SIZE ); } rtems_task Middle_tasks( diff --git a/c/src/tests/tmtests/tm14/Makefile.am b/c/src/tests/tmtests/tm14/Makefile.am index 41fb6c1db6..72f9c05e5d 100644 --- a/c/src/tests/tmtests/tm14/Makefile.am +++ b/c/src/tests/tmtests/tm14/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm14 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm14/system.h b/c/src/tests/tmtests/tm14/system.h index bed2533a81..d3f219713a 100644 --- a/c/src/tests/tmtests/tm14/system.h +++ b/c/src/tests/tmtests/tm14/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/tmtests/tm14/task1.c b/c/src/tests/tmtests/tm14/task1.c index fc84f6c19e..c368ca15be 100644 --- a/c/src/tests/tmtests/tm14/task1.c +++ b/c/src/tests/tmtests/tm14/task1.c @@ -29,6 +29,7 @@ rtems_task Low_tasks( rtems_task_argument argument ); +#define MESSAGE_SIZE (sizeof(long) * 4) rtems_task Init( rtems_task_argument argument @@ -72,7 +73,7 @@ rtems_task test_init( status = rtems_message_queue_create( rtems_build_name( 'M', 'Q', '1', ' ' ), OPERATION_COUNT, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id ); @@ -114,7 +115,7 @@ rtems_task High_task( Timer_initialize(); for ( index=1 ; index <= OPERATION_COUNT ; index++ ) - (void) rtems_message_queue_urgent( Queue_id, (long (*)[4]) Buffer, 16 ); + (void) rtems_message_queue_urgent( Queue_id, Buffer, MESSAGE_SIZE ); end_time = Read_timer(); put_time( diff --git a/c/src/tests/tmtests/tm15/Makefile.am b/c/src/tests/tmtests/tm15/Makefile.am index d8e9c9b2b5..b057f3e52d 100644 --- a/c/src/tests/tmtests/tm15/Makefile.am +++ b/c/src/tests/tmtests/tm15/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm15 MANAGERS = io event @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm15/system.h b/c/src/tests/tmtests/tm15/system.h index bed2533a81..d3f219713a 100644 --- a/c/src/tests/tmtests/tm15/system.h +++ b/c/src/tests/tmtests/tm15/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/tmtests/tm16/Makefile.am b/c/src/tests/tmtests/tm16/Makefile.am index 30655fd158..2226f48792 100644 --- a/c/src/tests/tmtests/tm16/Makefile.am +++ b/c/src/tests/tmtests/tm16/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm16 MANAGERS = io event @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm16/system.h b/c/src/tests/tmtests/tm16/system.h index bed2533a81..d3f219713a 100644 --- a/c/src/tests/tmtests/tm16/system.h +++ b/c/src/tests/tmtests/tm16/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/tmtests/tm17/Makefile.am b/c/src/tests/tmtests/tm17/Makefile.am index 9bc35a9830..a7eeb79078 100644 --- a/c/src/tests/tmtests/tm17/Makefile.am +++ b/c/src/tests/tmtests/tm17/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm17 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm17/system.h b/c/src/tests/tmtests/tm17/system.h index bed2533a81..d3f219713a 100644 --- a/c/src/tests/tmtests/tm17/system.h +++ b/c/src/tests/tmtests/tm17/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/tmtests/tm18/Makefile.am b/c/src/tests/tmtests/tm18/Makefile.am index b9f96377ec..dc8fe8a126 100644 --- a/c/src/tests/tmtests/tm18/Makefile.am +++ b/c/src/tests/tmtests/tm18/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm18 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm18/system.h b/c/src/tests/tmtests/tm18/system.h index bed2533a81..d3f219713a 100644 --- a/c/src/tests/tmtests/tm18/system.h +++ b/c/src/tests/tmtests/tm18/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/tmtests/tm19/Makefile.am b/c/src/tests/tmtests/tm19/Makefile.am index cc74b7aea7..4d8075f847 100644 --- a/c/src/tests/tmtests/tm19/Makefile.am +++ b/c/src/tests/tmtests/tm19/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm19 MANAGERS = io signal @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm19/system.h b/c/src/tests/tmtests/tm19/system.h index bed2533a81..d3f219713a 100644 --- a/c/src/tests/tmtests/tm19/system.h +++ b/c/src/tests/tmtests/tm19/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/tmtests/tm20/Makefile.am b/c/src/tests/tmtests/tm20/Makefile.am index f8b4d51fea..b73fc5b6e9 100644 --- a/c/src/tests/tmtests/tm20/Makefile.am +++ b/c/src/tests/tmtests/tm20/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm20 MANAGERS = io partition region @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm20/system.h b/c/src/tests/tmtests/tm20/system.h index b6e8ffc87b..52c36868c0 100644 --- a/c/src/tests/tmtests/tm20/system.h +++ b/c/src/tests/tmtests/tm20/system.h @@ -26,12 +26,11 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER -#define CONFIGURE_TEST_NEEDS_STUB_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER +#define CONFIGURE_MAXIMUM_TASKS 3 #define CONFIGURE_MAXIMUM_PARTITIONS 1 #define CONFIGURE_MAXIMUM_REGIONS 1 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/c/src/tests/tmtests/tm21/Makefile.am b/c/src/tests/tmtests/tm21/Makefile.am index a9fc96e91f..da5c5bff60 100644 --- a/c/src/tests/tmtests/tm21/Makefile.am +++ b/c/src/tests/tmtests/tm21/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm21 MANAGERS = io dpmem message partition region semaphore rate_monotonic timer @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm21/system.h b/c/src/tests/tmtests/tm21/system.h index e0b56c7e31..1ad2d74306 100644 --- a/c/src/tests/tmtests/tm21/system.h +++ b/c/src/tests/tmtests/tm21/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 102 #define CONFIGURE_MAXIMUM_TIMERS 100 diff --git a/c/src/tests/tmtests/tm21/task1.c b/c/src/tests/tmtests/tm21/task1.c index 6b0086eb24..42591316f3 100644 --- a/c/src/tests/tmtests/tm21/task1.c +++ b/c/src/tests/tmtests/tm21/task1.c @@ -48,6 +48,8 @@ rtems_task Init( directive_failed( status, "rtems_task_delete of RTEMS_SELF" ); } +#define MESSAGE_SIZE (sizeof(long) * 4) + rtems_task Task_1( rtems_task_argument argument ) @@ -70,7 +72,7 @@ rtems_task Task_1( status = rtems_message_queue_create( index, 1, /* only going to ident this queue */ - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &id ); diff --git a/c/src/tests/tmtests/tm22/Makefile.am b/c/src/tests/tmtests/tm22/Makefile.am index b7118f5aed..935b4a7d88 100644 --- a/c/src/tests/tmtests/tm22/Makefile.am +++ b/c/src/tests/tmtests/tm22/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm22 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm22/system.h b/c/src/tests/tmtests/tm22/system.h index 01af43fe96..ebdf6d4e80 100644 --- a/c/src/tests/tmtests/tm22/system.h +++ b/c/src/tests/tmtests/tm22/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 103 #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 diff --git a/c/src/tests/tmtests/tm22/task1.c b/c/src/tests/tmtests/tm22/task1.c index f5d577d2bf..3abb4cd22d 100644 --- a/c/src/tests/tmtests/tm22/task1.c +++ b/c/src/tests/tmtests/tm22/task1.c @@ -29,6 +29,8 @@ rtems_task Preempt_task( rtems_task_argument argument ); +#define MESSAGE_SIZE (sizeof(long) * 4) + rtems_task Init( rtems_task_argument argument ) @@ -43,7 +45,7 @@ rtems_task Init( status = rtems_message_queue_create( rtems_build_name( 'M', 'Q', '1', ' '), 100, - 16, + MESSAGE_SIZE, RTEMS_DEFAULT_ATTRIBUTES, &Queue_id ); @@ -89,8 +91,8 @@ rtems_task High_task( Timer_initialize(); (void) rtems_message_queue_broadcast( Queue_id, - (long (*)[4]) Buffer, - 16, + Buffer, + MESSAGE_SIZE, &count ); end_time = Read_timer(); @@ -143,8 +145,8 @@ rtems_task Low_task( for ( index=1 ; index <= OPERATION_COUNT ; index++ ) (void) rtems_message_queue_broadcast( Queue_id, - (long (*)[4]) Buffer, - 16, + Buffer, + MESSAGE_SIZE, &count ); end_time = Read_timer(); @@ -190,8 +192,8 @@ rtems_task Preempt_task( Timer_initialize(); (void) rtems_message_queue_broadcast( Queue_id, - (long (*)[4]) Buffer, - 16, + Buffer, + MESSAGE_SIZE, &count ); diff --git a/c/src/tests/tmtests/tm23/Makefile.am b/c/src/tests/tmtests/tm23/Makefile.am index 87511a98d0..577d3f73e8 100644 --- a/c/src/tests/tmtests/tm23/Makefile.am +++ b/c/src/tests/tmtests/tm23/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm23 MANAGERS = io event timer @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm23/system.h b/c/src/tests/tmtests/tm23/system.h index 02d86788f9..d95e26699a 100644 --- a/c/src/tests/tmtests/tm23/system.h +++ b/c/src/tests/tmtests/tm23/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_TIMERS 110 diff --git a/c/src/tests/tmtests/tm24/Makefile.am b/c/src/tests/tmtests/tm24/Makefile.am index 48e21ed881..1a3f357826 100644 --- a/c/src/tests/tmtests/tm24/Makefile.am +++ b/c/src/tests/tmtests/tm24/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm24 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm24/system.h b/c/src/tests/tmtests/tm24/system.h index 9ef1a69c6d..c61d4deea6 100644 --- a/c/src/tests/tmtests/tm24/system.h +++ b/c/src/tests/tmtests/tm24/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/c/src/tests/tmtests/tm25/Makefile.am b/c/src/tests/tmtests/tm25/Makefile.am index dd41b13fa7..7a8a9072db 100644 --- a/c/src/tests/tmtests/tm25/Makefile.am +++ b/c/src/tests/tmtests/tm25/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm25 MANAGERS = io semaphore @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm25/system.h b/c/src/tests/tmtests/tm25/system.h index ef4e319c73..d3be287997 100644 --- a/c/src/tests/tmtests/tm25/system.h +++ b/c/src/tests/tmtests/tm25/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_SEMAPHORES 1 diff --git a/c/src/tests/tmtests/tm26/Makefile.am b/c/src/tests/tmtests/tm26/Makefile.am index c488de3620..012086bb17 100644 --- a/c/src/tests/tmtests/tm26/Makefile.am +++ b/c/src/tests/tmtests/tm26/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm26 MANAGERS = io semaphore @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h fptest.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm26/system.h b/c/src/tests/tmtests/tm26/system.h index ef4e319c73..d3be287997 100644 --- a/c/src/tests/tmtests/tm26/system.h +++ b/c/src/tests/tmtests/tm26/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_SEMAPHORES 1 diff --git a/c/src/tests/tmtests/tm27/Makefile.am b/c/src/tests/tmtests/tm27/Makefile.am index 02caaaaeae..d78440296b 100644 --- a/c/src/tests/tmtests/tm27/Makefile.am +++ b/c/src/tests/tmtests/tm27/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm27 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm27/system.h b/c/src/tests/tmtests/tm27/system.h index 9ef1a69c6d..b6a42d2997 100644 --- a/c/src/tests/tmtests/tm27/system.h +++ b/c/src/tests/tmtests/tm27/system.h @@ -26,12 +26,10 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER -#define CONFIGURE_MAXIMUM_TASKS 111 +#define CONFIGURE_MAXIMUM_TASKS 10 #define CONFIGURE_TICKS_PER_TIMESLICE 0 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/tests/tmtests/tm28/Makefile.am b/c/src/tests/tmtests/tm28/Makefile.am index fc23e73d17..dbfe594e86 100644 --- a/c/src/tests/tmtests/tm28/Makefile.am +++ b/c/src/tests/tmtests/tm28/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm28 MANAGERS = io dpmem @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm28/system.h b/c/src/tests/tmtests/tm28/system.h index 85534f11ed..4a7687545f 100644 --- a/c/src/tests/tmtests/tm28/system.h +++ b/c/src/tests/tmtests/tm28/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_PORTS 1 diff --git a/c/src/tests/tmtests/tm29/Makefile.am b/c/src/tests/tmtests/tm29/Makefile.am index 83a1f29433..8060d44a24 100644 --- a/c/src/tests/tmtests/tm29/Makefile.am +++ b/c/src/tests/tmtests/tm29/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm29 MANAGERS = io rate_monotonic @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm29/system.h b/c/src/tests/tmtests/tm29/system.h index 90c664f348..4a6ebe21cd 100644 --- a/c/src/tests/tmtests/tm29/system.h +++ b/c/src/tests/tmtests/tm29/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 111 #define CONFIGURE_MAXIMUM_PERIODS 111 diff --git a/c/src/tests/tmtests/tmck/Makefile.am b/c/src/tests/tmtests/tmck/Makefile.am index c05e844246..6c03e2c36f 100644 --- a/c/src/tests/tmtests/tmck/Makefile.am +++ b/c/src/tests/tmtests/tmck/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tmck MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tmck/system.h b/c/src/tests/tmtests/tmck/system.h index 6866a1625e..750e2b3d22 100644 --- a/c/src/tests/tmtests/tmck/system.h +++ b/c/src/tests/tmtests/tmck/system.h @@ -26,10 +26,8 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/c/src/tests/tmtests/tmoverhd/Makefile.am b/c/src/tests/tmtests/tmoverhd/Makefile.am index 8455838e77..423c44da1f 100644 --- a/c/src/tests/tmtests/tmoverhd/Makefile.am +++ b/c/src/tests/tmtests/tmoverhd/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tmoverhd MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = testtask.c empty.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h dumrtems.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tmoverhd/system.h b/c/src/tests/tmtests/tmoverhd/system.h index ab43834a89..97d4a4e3e9 100644 --- a/c/src/tests/tmtests/tmoverhd/system.h +++ b/c/src/tests/tmtests/tmoverhd/system.h @@ -44,10 +44,8 @@ rtems_status_code Empty_directive(); /* configuration information */ -#define CONFIGURE_TMTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_TIMER_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_TICKS_PER_TIMESLICE 0 diff --git a/c/src/tests/tools/Makefile.am b/c/src/tests/tools/Makefile.am index ec01965fb6..8350d64884 100644 --- a/c/src/tests/tools/Makefile.am +++ b/c/src/tests/tools/Makefile.am @@ -8,4 +8,4 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal SUBDIRS = @subdirs@ include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../../../../automake/host.am diff --git a/c/src/tests/tools/generic/Makefile.am b/c/src/tests/tools/generic/Makefile.am index 642274f63c..ce72cdae4a 100644 --- a/c/src/tests/tools/generic/Makefile.am +++ b/c/src/tests/tools/generic/Makefile.am @@ -9,10 +9,8 @@ noinst_SCRIPTS = difftest sorttimes project_bspdir = $(PROJECT_ROOT)/@RTEMS_BSP@ -PREINSTALL_FILES = \ -$(project_bspdir)/tests \ -$(project_bspdir)/tests/difftest \ -$(project_bspdir)/tests/sorttimes +PREINSTALL_FILES += $(project_bspdir)/tests $(project_bspdir)/tests/difftest \ + $(project_bspdir)/tests/sorttimes $(project_bspdir)/tests: @$(mkinstalldirs) $@ |