From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- testsuites/tmtests/Makefile.am | 6 +++--- testsuites/tmtests/tm01/Makefile.am | 7 ++++--- testsuites/tmtests/tm01/system.h | 6 ++---- testsuites/tmtests/tm02/Makefile.am | 7 ++++--- testsuites/tmtests/tm02/system.h | 6 ++---- testsuites/tmtests/tm03/Makefile.am | 7 ++++--- testsuites/tmtests/tm03/system.h | 6 ++---- testsuites/tmtests/tm04/Makefile.am | 7 ++++--- testsuites/tmtests/tm04/system.h | 6 ++---- testsuites/tmtests/tm05/Makefile.am | 7 ++++--- testsuites/tmtests/tm05/system.h | 6 ++---- testsuites/tmtests/tm06/Makefile.am | 7 ++++--- testsuites/tmtests/tm06/system.h | 6 ++---- testsuites/tmtests/tm07/Makefile.am | 7 ++++--- testsuites/tmtests/tm07/system.h | 6 ++---- testsuites/tmtests/tm08/Makefile.am | 7 ++++--- testsuites/tmtests/tm08/system.h | 6 ++---- testsuites/tmtests/tm09/Makefile.am | 7 ++++--- testsuites/tmtests/tm09/system.h | 7 +++---- testsuites/tmtests/tm09/task1.c | 10 ++++++---- testsuites/tmtests/tm10/Makefile.am | 7 ++++--- testsuites/tmtests/tm10/system.h | 6 ++---- testsuites/tmtests/tm11/Makefile.am | 7 ++++--- testsuites/tmtests/tm11/system.h | 6 ++---- testsuites/tmtests/tm11/task1.c | 6 ++++-- testsuites/tmtests/tm12/Makefile.am | 7 ++++--- testsuites/tmtests/tm12/system.h | 6 ++---- testsuites/tmtests/tm12/task1.c | 5 +++-- testsuites/tmtests/tm13/Makefile.am | 7 ++++--- testsuites/tmtests/tm13/system.h | 6 ++---- testsuites/tmtests/tm13/task1.c | 6 ++++-- testsuites/tmtests/tm14/Makefile.am | 7 ++++--- testsuites/tmtests/tm14/system.h | 6 ++---- testsuites/tmtests/tm14/task1.c | 5 +++-- testsuites/tmtests/tm15/Makefile.am | 7 ++++--- testsuites/tmtests/tm15/system.h | 6 ++---- testsuites/tmtests/tm16/Makefile.am | 7 ++++--- testsuites/tmtests/tm16/system.h | 6 ++---- testsuites/tmtests/tm17/Makefile.am | 7 ++++--- testsuites/tmtests/tm17/system.h | 6 ++---- testsuites/tmtests/tm18/Makefile.am | 7 ++++--- testsuites/tmtests/tm18/system.h | 6 ++---- testsuites/tmtests/tm19/Makefile.am | 7 ++++--- testsuites/tmtests/tm19/system.h | 6 ++---- testsuites/tmtests/tm20/Makefile.am | 7 ++++--- testsuites/tmtests/tm20/system.h | 9 ++++----- testsuites/tmtests/tm21/Makefile.am | 7 ++++--- testsuites/tmtests/tm21/system.h | 6 ++---- testsuites/tmtests/tm21/task1.c | 4 +++- testsuites/tmtests/tm22/Makefile.am | 7 ++++--- testsuites/tmtests/tm22/system.h | 6 ++---- testsuites/tmtests/tm22/task1.c | 16 +++++++++------- testsuites/tmtests/tm23/Makefile.am | 7 ++++--- testsuites/tmtests/tm23/system.h | 6 ++---- testsuites/tmtests/tm24/Makefile.am | 7 ++++--- testsuites/tmtests/tm24/system.h | 6 ++---- testsuites/tmtests/tm25/Makefile.am | 7 ++++--- testsuites/tmtests/tm25/system.h | 6 ++---- testsuites/tmtests/tm26/Makefile.am | 7 ++++--- testsuites/tmtests/tm26/system.h | 6 ++---- testsuites/tmtests/tm27/Makefile.am | 7 ++++--- testsuites/tmtests/tm27/system.h | 8 +++----- testsuites/tmtests/tm28/Makefile.am | 7 ++++--- testsuites/tmtests/tm28/system.h | 6 ++---- testsuites/tmtests/tm29/Makefile.am | 7 ++++--- testsuites/tmtests/tm29/system.h | 6 ++---- testsuites/tmtests/tmck/Makefile.am | 7 ++++--- testsuites/tmtests/tmck/system.h | 6 ++---- testsuites/tmtests/tmoverhd/Makefile.am | 7 ++++--- testsuites/tmtests/tmoverhd/system.h | 6 ++---- 70 files changed, 225 insertions(+), 242 deletions(-) (limited to 'testsuites/tmtests') diff --git a/testsuites/tmtests/Makefile.am b/testsuites/tmtests/Makefile.am index 57d15492c6..6e9287a926 100644 --- a/testsuites/tmtests/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm01/Makefile.am b/testsuites/tmtests/tm01/Makefile.am index cec68ff0b8..7fae5e28c7 100644 --- a/testsuites/tmtests/tm01/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm01/system.h b/testsuites/tmtests/tm01/system.h index 891ad109c3..23125086dd 100644 --- a/testsuites/tmtests/tm01/system.h +++ b/testsuites/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/testsuites/tmtests/tm02/Makefile.am b/testsuites/tmtests/tm02/Makefile.am index 972dce7e71..ecaddf4f81 100644 --- a/testsuites/tmtests/tm02/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm02/system.h b/testsuites/tmtests/tm02/system.h index a2c701c05c..9219076f58 100644 --- a/testsuites/tmtests/tm02/system.h +++ b/testsuites/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/testsuites/tmtests/tm03/Makefile.am b/testsuites/tmtests/tm03/Makefile.am index 6f62d92019..f6b8cd86ea 100644 --- a/testsuites/tmtests/tm03/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm03/system.h b/testsuites/tmtests/tm03/system.h index a2c701c05c..9219076f58 100644 --- a/testsuites/tmtests/tm03/system.h +++ b/testsuites/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/testsuites/tmtests/tm04/Makefile.am b/testsuites/tmtests/tm04/Makefile.am index ba0f3b8b8d..9dc5b10e5c 100644 --- a/testsuites/tmtests/tm04/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm04/system.h b/testsuites/tmtests/tm04/system.h index ef4e319c73..d3be287997 100644 --- a/testsuites/tmtests/tm04/system.h +++ b/testsuites/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/testsuites/tmtests/tm05/Makefile.am b/testsuites/tmtests/tm05/Makefile.am index 9650859f45..fa80ba3799 100644 --- a/testsuites/tmtests/tm05/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm05/system.h b/testsuites/tmtests/tm05/system.h index a2c701c05c..9219076f58 100644 --- a/testsuites/tmtests/tm05/system.h +++ b/testsuites/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/testsuites/tmtests/tm06/Makefile.am b/testsuites/tmtests/tm06/Makefile.am index 034bce6b49..24a6f25988 100644 --- a/testsuites/tmtests/tm06/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm06/system.h b/testsuites/tmtests/tm06/system.h index a2c701c05c..9219076f58 100644 --- a/testsuites/tmtests/tm06/system.h +++ b/testsuites/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/testsuites/tmtests/tm07/Makefile.am b/testsuites/tmtests/tm07/Makefile.am index cdec5806be..0efde2c609 100644 --- a/testsuites/tmtests/tm07/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm07/system.h b/testsuites/tmtests/tm07/system.h index a2c701c05c..9219076f58 100644 --- a/testsuites/tmtests/tm07/system.h +++ b/testsuites/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/testsuites/tmtests/tm08/Makefile.am b/testsuites/tmtests/tm08/Makefile.am index 66eefd2380..4a1fb4c0bf 100644 --- a/testsuites/tmtests/tm08/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm08/system.h b/testsuites/tmtests/tm08/system.h index a2c701c05c..9219076f58 100644 --- a/testsuites/tmtests/tm08/system.h +++ b/testsuites/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/testsuites/tmtests/tm09/Makefile.am b/testsuites/tmtests/tm09/Makefile.am index 205a989fec..3770facbfb 100644 --- a/testsuites/tmtests/tm09/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm09/system.h b/testsuites/tmtests/tm09/system.h index b22856dafc..f5b30a1d04 100644 --- a/testsuites/tmtests/tm09/system.h +++ b/testsuites/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/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c index 27bbc0931e..34ce8b5a11 100644 --- a/testsuites/tmtests/tm09/task1.c +++ b/testsuites/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/testsuites/tmtests/tm10/Makefile.am b/testsuites/tmtests/tm10/Makefile.am index 72052067af..9de2e37108 100644 --- a/testsuites/tmtests/tm10/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm10/system.h b/testsuites/tmtests/tm10/system.h index ebdb1863a7..964ccc39c2 100644 --- a/testsuites/tmtests/tm10/system.h +++ b/testsuites/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/testsuites/tmtests/tm11/Makefile.am b/testsuites/tmtests/tm11/Makefile.am index c12ecf0788..b2d6f95a91 100644 --- a/testsuites/tmtests/tm11/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm11/system.h b/testsuites/tmtests/tm11/system.h index bed2533a81..d3f219713a 100644 --- a/testsuites/tmtests/tm11/system.h +++ b/testsuites/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/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c index 0afc1b9590..0ff58e4c87 100644 --- a/testsuites/tmtests/tm11/task1.c +++ b/testsuites/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/testsuites/tmtests/tm12/Makefile.am b/testsuites/tmtests/tm12/Makefile.am index 213f72271e..1895c02f35 100644 --- a/testsuites/tmtests/tm12/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm12/system.h b/testsuites/tmtests/tm12/system.h index bed2533a81..d3f219713a 100644 --- a/testsuites/tmtests/tm12/system.h +++ b/testsuites/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/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c index 7e57b29f12..5b67e59a19 100644 --- a/testsuites/tmtests/tm12/task1.c +++ b/testsuites/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/testsuites/tmtests/tm13/Makefile.am b/testsuites/tmtests/tm13/Makefile.am index caaf71f8b3..503f9af375 100644 --- a/testsuites/tmtests/tm13/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm13/system.h b/testsuites/tmtests/tm13/system.h index bed2533a81..d3f219713a 100644 --- a/testsuites/tmtests/tm13/system.h +++ b/testsuites/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/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c index 317b1f1805..0b2afc8571 100644 --- a/testsuites/tmtests/tm13/task1.c +++ b/testsuites/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/testsuites/tmtests/tm14/Makefile.am b/testsuites/tmtests/tm14/Makefile.am index 41fb6c1db6..72f9c05e5d 100644 --- a/testsuites/tmtests/tm14/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm14/system.h b/testsuites/tmtests/tm14/system.h index bed2533a81..d3f219713a 100644 --- a/testsuites/tmtests/tm14/system.h +++ b/testsuites/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/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c index fc84f6c19e..c368ca15be 100644 --- a/testsuites/tmtests/tm14/task1.c +++ b/testsuites/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/testsuites/tmtests/tm15/Makefile.am b/testsuites/tmtests/tm15/Makefile.am index d8e9c9b2b5..b057f3e52d 100644 --- a/testsuites/tmtests/tm15/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm15/system.h b/testsuites/tmtests/tm15/system.h index bed2533a81..d3f219713a 100644 --- a/testsuites/tmtests/tm15/system.h +++ b/testsuites/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/testsuites/tmtests/tm16/Makefile.am b/testsuites/tmtests/tm16/Makefile.am index 30655fd158..2226f48792 100644 --- a/testsuites/tmtests/tm16/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm16/system.h b/testsuites/tmtests/tm16/system.h index bed2533a81..d3f219713a 100644 --- a/testsuites/tmtests/tm16/system.h +++ b/testsuites/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/testsuites/tmtests/tm17/Makefile.am b/testsuites/tmtests/tm17/Makefile.am index 9bc35a9830..a7eeb79078 100644 --- a/testsuites/tmtests/tm17/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm17/system.h b/testsuites/tmtests/tm17/system.h index bed2533a81..d3f219713a 100644 --- a/testsuites/tmtests/tm17/system.h +++ b/testsuites/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/testsuites/tmtests/tm18/Makefile.am b/testsuites/tmtests/tm18/Makefile.am index b9f96377ec..dc8fe8a126 100644 --- a/testsuites/tmtests/tm18/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm18/system.h b/testsuites/tmtests/tm18/system.h index bed2533a81..d3f219713a 100644 --- a/testsuites/tmtests/tm18/system.h +++ b/testsuites/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/testsuites/tmtests/tm19/Makefile.am b/testsuites/tmtests/tm19/Makefile.am index cc74b7aea7..4d8075f847 100644 --- a/testsuites/tmtests/tm19/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm19/system.h b/testsuites/tmtests/tm19/system.h index bed2533a81..d3f219713a 100644 --- a/testsuites/tmtests/tm19/system.h +++ b/testsuites/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/testsuites/tmtests/tm20/Makefile.am b/testsuites/tmtests/tm20/Makefile.am index f8b4d51fea..b73fc5b6e9 100644 --- a/testsuites/tmtests/tm20/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm20/system.h b/testsuites/tmtests/tm20/system.h index b6e8ffc87b..52c36868c0 100644 --- a/testsuites/tmtests/tm20/system.h +++ b/testsuites/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/testsuites/tmtests/tm21/Makefile.am b/testsuites/tmtests/tm21/Makefile.am index a9fc96e91f..da5c5bff60 100644 --- a/testsuites/tmtests/tm21/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm21/system.h b/testsuites/tmtests/tm21/system.h index e0b56c7e31..1ad2d74306 100644 --- a/testsuites/tmtests/tm21/system.h +++ b/testsuites/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/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c index 6b0086eb24..42591316f3 100644 --- a/testsuites/tmtests/tm21/task1.c +++ b/testsuites/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/testsuites/tmtests/tm22/Makefile.am b/testsuites/tmtests/tm22/Makefile.am index b7118f5aed..935b4a7d88 100644 --- a/testsuites/tmtests/tm22/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm22/system.h b/testsuites/tmtests/tm22/system.h index 01af43fe96..ebdf6d4e80 100644 --- a/testsuites/tmtests/tm22/system.h +++ b/testsuites/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/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c index f5d577d2bf..3abb4cd22d 100644 --- a/testsuites/tmtests/tm22/task1.c +++ b/testsuites/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/testsuites/tmtests/tm23/Makefile.am b/testsuites/tmtests/tm23/Makefile.am index 87511a98d0..577d3f73e8 100644 --- a/testsuites/tmtests/tm23/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm23/system.h b/testsuites/tmtests/tm23/system.h index 02d86788f9..d95e26699a 100644 --- a/testsuites/tmtests/tm23/system.h +++ b/testsuites/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/testsuites/tmtests/tm24/Makefile.am b/testsuites/tmtests/tm24/Makefile.am index 48e21ed881..1a3f357826 100644 --- a/testsuites/tmtests/tm24/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm24/system.h b/testsuites/tmtests/tm24/system.h index 9ef1a69c6d..c61d4deea6 100644 --- a/testsuites/tmtests/tm24/system.h +++ b/testsuites/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/testsuites/tmtests/tm25/Makefile.am b/testsuites/tmtests/tm25/Makefile.am index dd41b13fa7..7a8a9072db 100644 --- a/testsuites/tmtests/tm25/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm25/system.h b/testsuites/tmtests/tm25/system.h index ef4e319c73..d3be287997 100644 --- a/testsuites/tmtests/tm25/system.h +++ b/testsuites/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/testsuites/tmtests/tm26/Makefile.am b/testsuites/tmtests/tm26/Makefile.am index c488de3620..012086bb17 100644 --- a/testsuites/tmtests/tm26/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm26/system.h b/testsuites/tmtests/tm26/system.h index ef4e319c73..d3be287997 100644 --- a/testsuites/tmtests/tm26/system.h +++ b/testsuites/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/testsuites/tmtests/tm27/Makefile.am b/testsuites/tmtests/tm27/Makefile.am index 02caaaaeae..d78440296b 100644 --- a/testsuites/tmtests/tm27/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm27/system.h b/testsuites/tmtests/tm27/system.h index 9ef1a69c6d..b6a42d2997 100644 --- a/testsuites/tmtests/tm27/system.h +++ b/testsuites/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/testsuites/tmtests/tm28/Makefile.am b/testsuites/tmtests/tm28/Makefile.am index fc23e73d17..dbfe594e86 100644 --- a/testsuites/tmtests/tm28/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm28/system.h b/testsuites/tmtests/tm28/system.h index 85534f11ed..4a7687545f 100644 --- a/testsuites/tmtests/tm28/system.h +++ b/testsuites/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/testsuites/tmtests/tm29/Makefile.am b/testsuites/tmtests/tm29/Makefile.am index 83a1f29433..8060d44a24 100644 --- a/testsuites/tmtests/tm29/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tm29/system.h b/testsuites/tmtests/tm29/system.h index 90c664f348..4a6ebe21cd 100644 --- a/testsuites/tmtests/tm29/system.h +++ b/testsuites/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/testsuites/tmtests/tmck/Makefile.am b/testsuites/tmtests/tmck/Makefile.am index c05e844246..6c03e2c36f 100644 --- a/testsuites/tmtests/tmck/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tmck/system.h b/testsuites/tmtests/tmck/system.h index 6866a1625e..750e2b3d22 100644 --- a/testsuites/tmtests/tmck/system.h +++ b/testsuites/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/testsuites/tmtests/tmoverhd/Makefile.am b/testsuites/tmtests/tmoverhd/Makefile.am index 8455838e77..423c44da1f 100644 --- a/testsuites/tmtests/tmoverhd/Makefile.am +++ b/testsuites/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/testsuites/tmtests/tmoverhd/system.h b/testsuites/tmtests/tmoverhd/system.h index ab43834a89..97d4a4e3e9 100644 --- a/testsuites/tmtests/tmoverhd/system.h +++ b/testsuites/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 -- cgit v1.2.3