diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-10-10 15:09:36 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-10-10 15:09:36 +0000 |
| commit | 1c78f6a975650faa673c18419e408bb1d5cf584b (patch) | |
| tree | 33f0ffe8d4797f12684238048ddcd3902cc84934 /testsuites | |
| parent | 2009-10-10 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-1c78f6a975650faa673c18419e408bb1d5cf584b.tar.bz2 | |
2009-10-10 Joel Sherrill <joel.sherrill@oarcorp.com>
* psxtimer01/psxtimer.c: Modify so it passes in a NULL to
timer_settime() for previous value. We are not using the
value in this particular case and this path must be exercised.
* psxtimer01/psxtimer01.scn: Update so it matches output on sis.
Diffstat (limited to 'testsuites')
| -rw-r--r-- | testsuites/psxtests/ChangeLog | 7 | ||||
| -rw-r--r-- | testsuites/psxtests/psxtimer01/psxtimer.c | 8 | ||||
| -rw-r--r-- | testsuites/psxtests/psxtimer01/psxtimer01.scn | 30 |
3 files changed, 32 insertions, 13 deletions
diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog index 04ce75b669..52b318fe64 100644 --- a/testsuites/psxtests/ChangeLog +++ b/testsuites/psxtests/ChangeLog @@ -1,3 +1,10 @@ +2009-10-10 Joel Sherrill <joel.sherrill@oarcorp.com> + + * psxtimer01/psxtimer.c: Modify so it passes in a NULL to + timer_settime() for previous value. We are not using the + value in this particular case and this path must be exercised. + * psxtimer01/psxtimer01.scn: Update so it matches output on sis. + 2009-09-28 Joel Sherrill <joel.sherrill@OARcorp.com> * psxcancel/init.c, psxcancel/psxcancel.scn, psxcancel01/init.c, diff --git a/testsuites/psxtests/psxtimer01/psxtimer.c b/testsuites/psxtests/psxtimer01/psxtimer.c index 3d1032a254..ac4617e6da 100644 --- a/testsuites/psxtests/psxtimer01/psxtimer.c +++ b/testsuites/psxtests/psxtimer01/psxtimer.c @@ -63,11 +63,13 @@ void StopTimer( struct itimerspec *timerdata ) { - struct itimerspec prev; - + /* + * We do not care about the old value. And this is a path + * that needs to be exercised anyway. + */ timerdata->it_value.tv_sec = 0; timerdata->it_value.tv_nsec = 0; - if (timer_settime(timer_id,POSIX_TIMER_RELATIVE,timerdata,&prev) == -1) { + if (timer_settime(timer_id,POSIX_TIMER_RELATIVE,timerdata,NULL) == -1) { perror ("Error in timer setting\n"); pthread_exit ((void *) -1); } diff --git a/testsuites/psxtests/psxtimer01/psxtimer01.scn b/testsuites/psxtests/psxtimer01/psxtimer01.scn index 44ee523a7f..c677d9086c 100644 --- a/testsuites/psxtests/psxtimer01/psxtimer01.scn +++ b/testsuites/psxtests/psxtimer01/psxtimer01.scn @@ -1,41 +1,51 @@ *** POSIX Timers Test 01 *** task A: timer_settime - value=0:0 interval=0:0 -Executing task B with count = 10 Fri Jan 1 00:00:02 1988 +Executing task B with count = 10 Fri Jan 1 00:00:01 1988 Executing task A with count = 20 Fri Jan 1 00:00:02 1988 Executing task A with count = 19 Fri Jan 1 00:00:03 1988 -Executing task B with count = 9 Fri Jan 1 00:00:04 1988 +Executing task B with count = 9 Fri Jan 1 00:00:03 1988 Executing task A with count = 18 Fri Jan 1 00:00:04 1988 Executing task A with count = 17 Fri Jan 1 00:00:05 1988 -Executing task B with count = 8 Fri Jan 1 00:00:06 1988 +Executing task B with count = 8 Fri Jan 1 00:00:05 1988 Executing task C with count = 6 Fri Jan 1 00:00:06 1988 Executing task A with count = 16 Fri Jan 1 00:00:06 1988 Executing task A with count = 15 Fri Jan 1 00:00:07 1988 -Executing task B with count = 7 Fri Jan 1 00:00:08 1988 +Executing task B with count = 7 Fri Jan 1 00:00:07 1988 Executing task A with count = 14 Fri Jan 1 00:00:08 1988 Executing task C with count = 5 Fri Jan 1 00:00:09 1988 Executing task A with count = 13 Fri Jan 1 00:00:09 1988 -Executing task B with count = 6 Fri Jan 1 00:00:10 1988 +Executing task B with count = 6 Fri Jan 1 00:00:09 1988 Executing task A with count = 12 Fri Jan 1 00:00:10 1988 Executing task A with count = 11 Fri Jan 1 00:00:11 1988 -Executing task B with count = 5 Fri Jan 1 00:00:12 1988 +Executing task B with count = 5 Fri Jan 1 00:00:11 1988 Executing task C with count = 4 Fri Jan 1 00:00:12 1988 Executing task A with count = 10 Fri Jan 1 00:00:12 1988 Executing task A with count = 9 Fri Jan 1 00:00:13 1988 -Executing task B with count = 4 Fri Jan 1 00:00:14 1988 +Executing task B with count = 4 Fri Jan 1 00:00:13 1988 Executing task A with count = 8 Fri Jan 1 00:00:14 1988 Executing task C with count = 3 Fri Jan 1 00:00:15 1988 Executing task A with count = 7 Fri Jan 1 00:00:15 1988 -Executing task B with count = 3 Fri Jan 1 00:00:16 1988 +Executing task B with count = 3 Fri Jan 1 00:00:15 1988 Executing task A with count = 6 Fri Jan 1 00:00:16 1988 Executing task A with count = 5 Fri Jan 1 00:00:17 1988 -Executing task B with count = 2 Fri Jan 1 00:00:18 1988 +Executing task B with count = 2 Fri Jan 1 00:00:17 1988 Executing task C with count = 2 Fri Jan 1 00:00:18 1988 Executing task A with count = 4 Fri Jan 1 00:00:18 1988 Executing task A with count = 3 Fri Jan 1 00:00:19 1988 -Executing task B with count = 1 Fri Jan 1 00:00:20 1988 +Executing task B with count = 1 Fri Jan 1 00:00:19 1988 Executing task A with count = 2 Fri Jan 1 00:00:20 1988 Executing task C with count = 1 Fri Jan 1 00:00:21 1988 Executing task A with count = 1 Fri Jan 1 00:00:21 1988 task C: timer_getoverrun - overruns=0 task C: timer_gettime - 2:0 remaining from 3:0 +starting C again with 0.5 second periodicity +Executing task C with count = 6 Fri Jan 1 00:00:25 1988 +Executing task C with count = 5 Fri Jan 1 00:00:26 1988 +Executing task C with count = 4 Fri Jan 1 00:00:26 1988 +Executing task C with count = 3 Fri Jan 1 00:00:27 1988 +Executing task C with count = 2 Fri Jan 1 00:00:27 1988 +Executing task C with count = 1 Fri Jan 1 00:00:28 1988 +task C: timer_getoverrun - overruns=0 +task C: timer_gettime - 0:500000000 remaining from 0:500000000 +Executing task C with count = 0 Fri Jan 1 00:00:29 1988 *** END OF POSIX Timers Test 01 *** |