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/mptests/mp10/node1/Makefile.am | 6 +++--- testsuites/mptests/mp10/node2/Makefile.am | 6 +++--- testsuites/mptests/mp10/system.h | 9 ++++++--- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'testsuites/mptests/mp10') diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am index 15c3130981..7281b77bcf 100644 --- a/testsuites/mptests/mp10/node1/Makefile.am +++ b/testsuites/mptests/mp10/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am index 9631817320..8750e465dc 100644 --- a/testsuites/mptests/mp10/node2/Makefile.am +++ b/testsuites/mptests/mp10/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/testsuites/mptests/mp10/system.h b/testsuites/mptests/mp10/system.h index d41dd4c8e4..e101987446 100644 --- a/testsuites/mptests/mp10/system.h +++ b/testsuites/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 -- cgit v1.2.3