From 6da9972793a620b4574e4d741004797c92e3eeaf Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 14 Nov 2002 17:36:48 +0000 Subject: 2002-11-14 Joel Sherrill * psx01/psx01.scn, psx02/psx02.scn, psx03/psx03.scn, psx04/psx04.scn, psx05/psx05.scn, psx06/psx06.scn, psx07/psx07.scn, psx08/psx08.scn, psx09/psx09.scn, psx10/psx10.scn, psx11/psx11.scn, psx12/psx12.scn: Per PR239 update the IDs in the various screens. --- c/src/tests/psxtests/ChangeLog | 7 +++++++ c/src/tests/psxtests/psx01/psx01.scn | 4 ++-- c/src/tests/psxtests/psx02/psx02.scn | 2 +- c/src/tests/psxtests/psx03/psx03.scn | 2 +- c/src/tests/psxtests/psx04/psx04.scn | 2 +- c/src/tests/psxtests/psx05/psx05.scn | 2 +- c/src/tests/psxtests/psx06/psx06.scn | 2 +- c/src/tests/psxtests/psx07/psx07.scn | 2 +- c/src/tests/psxtests/psx08/psx08.scn | 2 +- c/src/tests/psxtests/psx09/psx09.scn | 2 +- c/src/tests/psxtests/psx10/psx10.scn | 6 +++--- c/src/tests/psxtests/psx11/psx11.scn | 2 +- c/src/tests/psxtests/psx12/psx12.scn | 2 +- testsuites/psxtests/ChangeLog | 7 +++++++ testsuites/psxtests/psx01/psx01.scn | 4 ++-- testsuites/psxtests/psx02/psx02.scn | 2 +- testsuites/psxtests/psx03/psx03.scn | 2 +- testsuites/psxtests/psx04/psx04.scn | 2 +- testsuites/psxtests/psx05/psx05.scn | 2 +- testsuites/psxtests/psx06/psx06.scn | 2 +- testsuites/psxtests/psx07/psx07.scn | 2 +- testsuites/psxtests/psx08/psx08.scn | 2 +- testsuites/psxtests/psx09/psx09.scn | 2 +- testsuites/psxtests/psx10/psx10.scn | 6 +++--- testsuites/psxtests/psx11/psx11.scn | 2 +- testsuites/psxtests/psx12/psx12.scn | 2 +- 26 files changed, 44 insertions(+), 30 deletions(-) diff --git a/c/src/tests/psxtests/ChangeLog b/c/src/tests/psxtests/ChangeLog index d12a2d92d1..5e94f19fbb 100644 --- a/c/src/tests/psxtests/ChangeLog +++ b/c/src/tests/psxtests/ChangeLog @@ -1,3 +1,10 @@ +2002-11-14 Joel Sherrill + + * psx01/psx01.scn, psx02/psx02.scn, psx03/psx03.scn, psx04/psx04.scn, + psx05/psx05.scn, psx06/psx06.scn, psx07/psx07.scn, psx08/psx08.scn, + psx09/psx09.scn, psx10/psx10.scn, psx11/psx11.scn, psx12/psx12.scn: + Per PR239 update the IDs in the various screens. + 2002-10-21 Ralf Corsepius * .cvsignore: Reformat. diff --git a/c/src/tests/psxtests/psx01/psx01.scn b/c/src/tests/psxtests/psx01/psx01.scn index 82e98bbcbc..7633a05d89 100644 --- a/c/src/tests/psxtests/psx01/psx01.scn +++ b/c/src/tests/psxtests/psx01/psx01.scn @@ -28,7 +28,7 @@ Init: nanosleep - yield Init: nanosleep - 3.05 seconds Fri May 24 11:05:06 1996 Init: sec (0), nsec (0) remaining -Init: ID is 0x0c010001 +Init: ID is 0x0b010001 Init: sched_get_priority_min (SCHED_FIFO) -- 1 Init: sched_get_priority_min -- EINVAL (invalid policy) Init: sched_get_priority_max (SCHED_FIFO) -- 254 @@ -40,7 +40,7 @@ Init: sched_yield to Task_1 Task_1: sched_yield to Init Init: pthread_exit -Task_1: ID is 0x0c010002 +Task_1: ID is 0x0b010002 Task_1: pthread_equal - match case passed Task_1: pthread_equal - different case passed Task_1: pthread_equal - first id bad diff --git a/c/src/tests/psxtests/psx02/psx02.scn b/c/src/tests/psxtests/psx02/psx02.scn index 3b0d373b16..573bfee91a 100644 --- a/c/src/tests/psxtests/psx02/psx02.scn +++ b/c/src/tests/psxtests/psx02/psx02.scn @@ -1,5 +1,5 @@ *** POSIX TEST 2 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Signal: 16 caught by 0xc010001 (1) Init: Block SIGUSR1 Init: Signals pending 0x00000000 diff --git a/c/src/tests/psxtests/psx03/psx03.scn b/c/src/tests/psxtests/psx03/psx03.scn index 28ebc311d4..2436910302 100644 --- a/c/src/tests/psxtests/psx03/psx03.scn +++ b/c/src/tests/psxtests/psx03/psx03.scn @@ -1,5 +1,5 @@ *** POSIX TEST 3 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: waiting on any signal for 3 seconds. Init: correctly timed out waiting for SIGUSR1. diff --git a/c/src/tests/psxtests/psx04/psx04.scn b/c/src/tests/psxtests/psx04/psx04.scn index 43aaa83866..9c78c445ef 100644 --- a/c/src/tests/psxtests/psx04/psx04.scn +++ b/c/src/tests/psxtests/psx04/psx04.scn @@ -1,5 +1,5 @@ *** POSIX TEST 4 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: sigemptyset - set= 0x00000000 Init: sigfillset - set= 0xffffffff Init: sigdelset - delete SIGUSR1 set= 0xffff7fff diff --git a/c/src/tests/psxtests/psx05/psx05.scn b/c/src/tests/psxtests/psx05/psx05.scn index 83d46b5a90..bc93da60b8 100644 --- a/c/src/tests/psxtests/psx05/psx05.scn +++ b/c/src/tests/psxtests/psx05/psx05.scn @@ -1,5 +1,5 @@ *** POSIX TEST 5 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: pthread_mutexattr_init - EINVAL (NULL attr) Init: pthread_mutexattr_init - SUCCESSFUL Init: mutex protocol is (0) -- PTHREAD_PRIO_NONE diff --git a/c/src/tests/psxtests/psx06/psx06.scn b/c/src/tests/psxtests/psx06/psx06.scn index ca50710ed2..4e16ee4e37 100644 --- a/c/src/tests/psxtests/psx06/psx06.scn +++ b/c/src/tests/psxtests/psx06/psx06.scn @@ -1,5 +1,5 @@ *** POSIX TEST 6 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: pthread_key_create - SUCCESSFUL Destructor invoked 0 times Init: pthread_key_create - EAGAIN (too many keys) diff --git a/c/src/tests/psxtests/psx07/psx07.scn b/c/src/tests/psxtests/psx07/psx07.scn index 08f844896e..4237c4791b 100644 --- a/c/src/tests/psxtests/psx07/psx07.scn +++ b/c/src/tests/psxtests/psx07/psx07.scn @@ -1,5 +1,5 @@ *** POSIX TEST 7 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: pthread_attr_init - EINVAL (NULL attr) Init: pthread_attr_init - SUCCESSFUL Init: initialize and destroy an attribute - SUCCESSFUL diff --git a/c/src/tests/psxtests/psx08/psx08.scn b/c/src/tests/psxtests/psx08/psx08.scn index 8629b610f2..9b76f51a2f 100644 --- a/c/src/tests/psxtests/psx08/psx08.scn +++ b/c/src/tests/psxtests/psx08/psx08.scn @@ -1,5 +1,5 @@ *** POSIX TEST 8 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: pthread_detach - ESRCH (invalid id) Init: pthread_detach self Init: pthread_join - ESRCH (invalid id) diff --git a/c/src/tests/psxtests/psx09/psx09.scn b/c/src/tests/psxtests/psx09/psx09.scn index 373012f801..adf62c5ee3 100644 --- a/c/src/tests/psxtests/psx09/psx09.scn +++ b/c/src/tests/psxtests/psx09/psx09.scn @@ -1,5 +1,5 @@ *** POSIX TEST 9 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: pthread_getschedparam - SUCCESSFUL Init: Fri May 24 11:05:00 1996 - current priority = 2 Init: pthread_setschedparam - SUCCESSFUL (sporadic server) diff --git a/c/src/tests/psxtests/psx10/psx10.scn b/c/src/tests/psxtests/psx10/psx10.scn index 0247781efa..962540d6e4 100644 --- a/c/src/tests/psxtests/psx10/psx10.scn +++ b/c/src/tests/psxtests/psx10/psx10.scn @@ -17,14 +17,14 @@ Init: pthread_cond_destroy Init: pthread_cond_destroy - EINVAL (cond invalid) Init: pthread_cond_init - attr Init: sleep to switch to Task_1 -Task_1: ID is 0x0c010002 +Task_1: ID is 0x0b010002 Task_1: pthread_cond_wait Init: pthread_cond_destroy - EBUSY (task1 waiting) Init: pthread_cond_signal Init: sleep - switch to Task_1 and Task_2 Task_1: back from pthread_cond_wait release mutex Task_1: pthread_cond_wait -Task_2: ID is 0x0c010003 +Task_2: ID is 0x0b010003 Task_2: pthread_cond_wait Init: pthread_cond_broadcast Init: sleep - switch to Task_1 @@ -46,7 +46,7 @@ Init: pthread_cond_timedwait - ETIMEDOUT (abstime->tv_nsec < current time) Init: pthread_cond_wait - EINVAL (mutex not locked before call) Init: pthread_cond_timedwait - EINVAL (mutex not locked before call) Init: sleep - switch to Task_3 -Task_3: ID is 0x0c010004 +Task_3: ID is 0x0b010004 Task_3: pthread_cond_wait Init: pthread_cond_signal Init: sleep - switch to Task_3 diff --git a/c/src/tests/psxtests/psx11/psx11.scn b/c/src/tests/psxtests/psx11/psx11.scn index 69df5ec1b9..ecf69edf61 100644 --- a/c/src/tests/psxtests/psx11/psx11.scn +++ b/c/src/tests/psxtests/psx11/psx11.scn @@ -1,5 +1,5 @@ *** POSIX TEST 11 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: Setting scheduling parameters to FIFO with priority 127 Init: Setting scheduling parameters to RR with priority 125 Init: Setting scheduling parameters to OTHER with priority 121 diff --git a/c/src/tests/psxtests/psx12/psx12.scn b/c/src/tests/psxtests/psx12/psx12.scn index fd969cb122..e35bdab6ae 100644 --- a/c/src/tests/psxtests/psx12/psx12.scn +++ b/c/src/tests/psxtests/psx12/psx12.scn @@ -1,5 +1,5 @@ *** POSIX TEST 12 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: pthread_attr_init - SUCCESSFUL Init: pthread_create - EINVAL (invalid scheduling policy) Init: pthread_attr_init - SUCCESSFUL diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog index d12a2d92d1..5e94f19fbb 100644 --- a/testsuites/psxtests/ChangeLog +++ b/testsuites/psxtests/ChangeLog @@ -1,3 +1,10 @@ +2002-11-14 Joel Sherrill + + * psx01/psx01.scn, psx02/psx02.scn, psx03/psx03.scn, psx04/psx04.scn, + psx05/psx05.scn, psx06/psx06.scn, psx07/psx07.scn, psx08/psx08.scn, + psx09/psx09.scn, psx10/psx10.scn, psx11/psx11.scn, psx12/psx12.scn: + Per PR239 update the IDs in the various screens. + 2002-10-21 Ralf Corsepius * .cvsignore: Reformat. diff --git a/testsuites/psxtests/psx01/psx01.scn b/testsuites/psxtests/psx01/psx01.scn index 82e98bbcbc..7633a05d89 100644 --- a/testsuites/psxtests/psx01/psx01.scn +++ b/testsuites/psxtests/psx01/psx01.scn @@ -28,7 +28,7 @@ Init: nanosleep - yield Init: nanosleep - 3.05 seconds Fri May 24 11:05:06 1996 Init: sec (0), nsec (0) remaining -Init: ID is 0x0c010001 +Init: ID is 0x0b010001 Init: sched_get_priority_min (SCHED_FIFO) -- 1 Init: sched_get_priority_min -- EINVAL (invalid policy) Init: sched_get_priority_max (SCHED_FIFO) -- 254 @@ -40,7 +40,7 @@ Init: sched_yield to Task_1 Task_1: sched_yield to Init Init: pthread_exit -Task_1: ID is 0x0c010002 +Task_1: ID is 0x0b010002 Task_1: pthread_equal - match case passed Task_1: pthread_equal - different case passed Task_1: pthread_equal - first id bad diff --git a/testsuites/psxtests/psx02/psx02.scn b/testsuites/psxtests/psx02/psx02.scn index 3b0d373b16..573bfee91a 100644 --- a/testsuites/psxtests/psx02/psx02.scn +++ b/testsuites/psxtests/psx02/psx02.scn @@ -1,5 +1,5 @@ *** POSIX TEST 2 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Signal: 16 caught by 0xc010001 (1) Init: Block SIGUSR1 Init: Signals pending 0x00000000 diff --git a/testsuites/psxtests/psx03/psx03.scn b/testsuites/psxtests/psx03/psx03.scn index 28ebc311d4..2436910302 100644 --- a/testsuites/psxtests/psx03/psx03.scn +++ b/testsuites/psxtests/psx03/psx03.scn @@ -1,5 +1,5 @@ *** POSIX TEST 3 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: waiting on any signal for 3 seconds. Init: correctly timed out waiting for SIGUSR1. diff --git a/testsuites/psxtests/psx04/psx04.scn b/testsuites/psxtests/psx04/psx04.scn index 43aaa83866..9c78c445ef 100644 --- a/testsuites/psxtests/psx04/psx04.scn +++ b/testsuites/psxtests/psx04/psx04.scn @@ -1,5 +1,5 @@ *** POSIX TEST 4 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: sigemptyset - set= 0x00000000 Init: sigfillset - set= 0xffffffff Init: sigdelset - delete SIGUSR1 set= 0xffff7fff diff --git a/testsuites/psxtests/psx05/psx05.scn b/testsuites/psxtests/psx05/psx05.scn index 83d46b5a90..bc93da60b8 100644 --- a/testsuites/psxtests/psx05/psx05.scn +++ b/testsuites/psxtests/psx05/psx05.scn @@ -1,5 +1,5 @@ *** POSIX TEST 5 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: pthread_mutexattr_init - EINVAL (NULL attr) Init: pthread_mutexattr_init - SUCCESSFUL Init: mutex protocol is (0) -- PTHREAD_PRIO_NONE diff --git a/testsuites/psxtests/psx06/psx06.scn b/testsuites/psxtests/psx06/psx06.scn index ca50710ed2..4e16ee4e37 100644 --- a/testsuites/psxtests/psx06/psx06.scn +++ b/testsuites/psxtests/psx06/psx06.scn @@ -1,5 +1,5 @@ *** POSIX TEST 6 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: pthread_key_create - SUCCESSFUL Destructor invoked 0 times Init: pthread_key_create - EAGAIN (too many keys) diff --git a/testsuites/psxtests/psx07/psx07.scn b/testsuites/psxtests/psx07/psx07.scn index 08f844896e..4237c4791b 100644 --- a/testsuites/psxtests/psx07/psx07.scn +++ b/testsuites/psxtests/psx07/psx07.scn @@ -1,5 +1,5 @@ *** POSIX TEST 7 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: pthread_attr_init - EINVAL (NULL attr) Init: pthread_attr_init - SUCCESSFUL Init: initialize and destroy an attribute - SUCCESSFUL diff --git a/testsuites/psxtests/psx08/psx08.scn b/testsuites/psxtests/psx08/psx08.scn index 8629b610f2..9b76f51a2f 100644 --- a/testsuites/psxtests/psx08/psx08.scn +++ b/testsuites/psxtests/psx08/psx08.scn @@ -1,5 +1,5 @@ *** POSIX TEST 8 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: pthread_detach - ESRCH (invalid id) Init: pthread_detach self Init: pthread_join - ESRCH (invalid id) diff --git a/testsuites/psxtests/psx09/psx09.scn b/testsuites/psxtests/psx09/psx09.scn index 373012f801..adf62c5ee3 100644 --- a/testsuites/psxtests/psx09/psx09.scn +++ b/testsuites/psxtests/psx09/psx09.scn @@ -1,5 +1,5 @@ *** POSIX TEST 9 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: pthread_getschedparam - SUCCESSFUL Init: Fri May 24 11:05:00 1996 - current priority = 2 Init: pthread_setschedparam - SUCCESSFUL (sporadic server) diff --git a/testsuites/psxtests/psx10/psx10.scn b/testsuites/psxtests/psx10/psx10.scn index 0247781efa..962540d6e4 100644 --- a/testsuites/psxtests/psx10/psx10.scn +++ b/testsuites/psxtests/psx10/psx10.scn @@ -17,14 +17,14 @@ Init: pthread_cond_destroy Init: pthread_cond_destroy - EINVAL (cond invalid) Init: pthread_cond_init - attr Init: sleep to switch to Task_1 -Task_1: ID is 0x0c010002 +Task_1: ID is 0x0b010002 Task_1: pthread_cond_wait Init: pthread_cond_destroy - EBUSY (task1 waiting) Init: pthread_cond_signal Init: sleep - switch to Task_1 and Task_2 Task_1: back from pthread_cond_wait release mutex Task_1: pthread_cond_wait -Task_2: ID is 0x0c010003 +Task_2: ID is 0x0b010003 Task_2: pthread_cond_wait Init: pthread_cond_broadcast Init: sleep - switch to Task_1 @@ -46,7 +46,7 @@ Init: pthread_cond_timedwait - ETIMEDOUT (abstime->tv_nsec < current time) Init: pthread_cond_wait - EINVAL (mutex not locked before call) Init: pthread_cond_timedwait - EINVAL (mutex not locked before call) Init: sleep - switch to Task_3 -Task_3: ID is 0x0c010004 +Task_3: ID is 0x0b010004 Task_3: pthread_cond_wait Init: pthread_cond_signal Init: sleep - switch to Task_3 diff --git a/testsuites/psxtests/psx11/psx11.scn b/testsuites/psxtests/psx11/psx11.scn index 69df5ec1b9..ecf69edf61 100644 --- a/testsuites/psxtests/psx11/psx11.scn +++ b/testsuites/psxtests/psx11/psx11.scn @@ -1,5 +1,5 @@ *** POSIX TEST 11 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: Setting scheduling parameters to FIFO with priority 127 Init: Setting scheduling parameters to RR with priority 125 Init: Setting scheduling parameters to OTHER with priority 121 diff --git a/testsuites/psxtests/psx12/psx12.scn b/testsuites/psxtests/psx12/psx12.scn index fd969cb122..e35bdab6ae 100644 --- a/testsuites/psxtests/psx12/psx12.scn +++ b/testsuites/psxtests/psx12/psx12.scn @@ -1,5 +1,5 @@ *** POSIX TEST 12 *** -Init's ID is 0x0c010001 +Init's ID is 0x0b010001 Init: pthread_attr_init - SUCCESSFUL Init: pthread_create - EINVAL (invalid scheduling policy) Init: pthread_attr_init - SUCCESSFUL -- cgit v1.2.3