From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 testsuites/psxtests/psx01/Makefile.am | 7 ++++---
 testsuites/psxtests/psx01/psx01.scn   | 6 ++++--
 testsuites/psxtests/psx01/system.h    | 8 +++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'testsuites/psxtests/psx01')

diff --git a/testsuites/psxtests/psx01/Makefile.am b/testsuites/psxtests/psx01/Makefile.am
index 43b7c3a42a..e16bf6234d 100644
--- a/testsuites/psxtests/psx01/Makefile.am
+++ b/testsuites/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/testsuites/psxtests/psx01/psx01.scn b/testsuites/psxtests/psx01/psx01.scn
index b5983ba11f..fcab0f4c65 100644
--- a/testsuites/psxtests/psx01/psx01.scn
+++ b/testsuites/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/testsuites/psxtests/psx01/system.h b/testsuites/psxtests/psx01/system.h
index 9b55eea1d0..919521ed63 100644
--- a/testsuites/psxtests/psx01/system.h
+++ b/testsuites/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 */
-- 
cgit v1.2.3