diff options
Diffstat (limited to '')
50 files changed, 220 insertions, 190 deletions
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 |