diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-04-05 21:14:24 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-04-05 21:14:24 +0000 |
commit | 68e2f0746e09fb33ef4e9139c1e5d361c90059e3 (patch) | |
tree | 070f9ee5184ae5e7deee8a56dfc04b77168e7dea /testsuites/psxtests/psx01 | |
parent | d51ecd6369edebead753aec967a12c6f7802589d (diff) |
2007-04-05 Joel Sherrill <joel@OARcorp.com>
* psx01/init.c, psx01/psx01.scn: Adjust test to account for nanosleep()
behavior more closely matching GNU/Linux.
Diffstat (limited to 'testsuites/psxtests/psx01')
-rw-r--r-- | testsuites/psxtests/psx01/init.c | 3 | ||||
-rw-r--r-- | testsuites/psxtests/psx01/psx01.scn | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/testsuites/psxtests/psx01/init.c b/testsuites/psxtests/psx01/init.c index 4aa3cb7d81..5a7547e0b8 100644 --- a/testsuites/psxtests/psx01/init.c +++ b/testsuites/psxtests/psx01/init.c @@ -142,7 +142,8 @@ void *POSIX_Init( tv.tv_nsec = 0; puts( "Init: nanosleep - negative seconds small delay " ); status = nanosleep ( &tv, &tr ); - assert( !status ); + assert( status == -1 ); + assert( errno == EINVAL ); /* use nanosleep to yield */ diff --git a/testsuites/psxtests/psx01/psx01.scn b/testsuites/psxtests/psx01/psx01.scn index 7633a05d89..eb281705d1 100644 --- a/testsuites/psxtests/psx01/psx01.scn +++ b/testsuites/psxtests/psx01/psx01.scn @@ -2,11 +2,9 @@ Init: uname - EFAULT (invalid uts pointer argument) Init: uts.sysname: RTEMS Init: uts.nodename: Node 1 -Init: uts.release: rtems-VERSION -NOTE: VERSION will vary. -Init: uts.version: -Init: uts.machine: CPU/CPU Model -NOTE: CPU/CPU Model will vary. +Init: uts.release: 4.7.99.1 +Init: uts.version: +Init: uts.machine: SPARC/w/FPU Init: clock_gettime - EINVAL (invalid clockid) Init: clock_settime - EINVAL (invalid clockid) Init: clock_getres - EINVAL (invalid clockid) @@ -20,7 +18,6 @@ Fri May 24 11:05:00 1996 Fri May 24 11:05:03 1996 Fri May 24 11:05:03 1996 Init: seconds remaining (0) - Init: nanosleep - EINVAL (NULL time) Init: nanosleep - EINVAL (too many nanoseconds) Init: nanosleep - negative seconds small delay @@ -39,7 +36,6 @@ Init: pthread_create - EAGAIN (too many threads) Init: sched_yield to Task_1 Task_1: sched_yield to Init Init: pthread_exit - Task_1: ID is 0x0b010002 Task_1: pthread_equal - match case passed Task_1: pthread_equal - different case passed |