RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Corrected test and screen to reflect implementation working.

Browse Source
This commit is contained in:
Joel Sherrill
2000-01-05 22:03:44 +00:00
parent 5cffd6406b
commit 280c4ca921
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
c/src/tests/sptests/sp29/init.c
View File

@@ -67,6 +67,9 @@ rtems_task Init (rtems_task_argument ignored)
rtems_status_code sc; rtems_status_code sc;
rtems_interval then, now; rtems_interval then, now;
puts( "*** SP29 - SIMPLE SEMAPHORE TEST ***" );
puts( "This test only prints on errors." );
sc = rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond); sc = rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond);
if (sc != RTEMS_SUCCESSFUL) { if (sc != RTEMS_SUCCESSFUL) {
printf ("Can't get ticks per second: %s\n", rtems_status_text (sc)); printf ("Can't get ticks per second: %s\n", rtems_status_text (sc));
@@ -83,7 +86,7 @@ rtems_task Init (rtems_task_argument ignored)
} }
sc = rtems_semaphore_create (rtems_build_name ('S', 'M', 'n', 'c'), sc = rtems_semaphore_create (rtems_build_name ('S', 'M', 'n', 'c'),
1, 1,
RTEMS_PRIORITY|RTEMS_BINARY_SEMAPHORE|RTEMS_NO_NESTING_ALLOWED|RTEMS_INHERIT_PRIORITY |RTEMS_NO_PRIORITY_CEILING|RTEMS_LOCAL, RTEMS_PRIORITY|RTEMS_SIMPLE_BINARY_SEMAPHORE|RTEMS_INHERIT_PRIORITY |RTEMS_NO_PRIORITY_CEILING|RTEMS_LOCAL,
0, 0,
&semnorec); &semnorec);
if (sc != RTEMS_SUCCESSFUL) { if (sc != RTEMS_SUCCESSFUL) {
@@ -151,8 +154,8 @@ rtems_task Init (rtems_task_argument ignored)
if (sc == RTEMS_SUCCESSFUL) { if (sc == RTEMS_SUCCESSFUL) {
printf ("%d: Reobtain non-recursive-lock semaphore -- and should not have.\n", __LINE__); printf ("%d: Reobtain non-recursive-lock semaphore -- and should not have.\n", __LINE__);
} }
else if (sc != RTEMS_UNSATISFIED) { else if (sc != RTEMS_TIMEOUT) {
printf ("%d: Reobtain non-recursive-lock semaphore failed, but error is %d (%s), not RTEMS_UNSATISFIED.\n", __LINE__, sc, rtems_status_text (sc)); printf ("%d: Reobtain non-recursive-lock semaphore failed, but error is %d (%s), not RTEMS_TIMEOUT.\n", __LINE__, sc, rtems_status_text (sc));
} }
if ((then - now) < 4) if ((then - now) < 4)
printf ("%d: Reobtain non-recursive-lock semaphore failed without timeout.\n", __LINE__); printf ("%d: Reobtain non-recursive-lock semaphore failed without timeout.\n", __LINE__);
@@ -168,9 +171,10 @@ rtems_task Init (rtems_task_argument ignored)
then = now; then = now;
if (sc != RTEMS_SUCCESSFUL) if (sc != RTEMS_SUCCESSFUL)
printf ("%d: Failed to obtain non-recursive-lock semaphore: %s\n", __LINE__, rtems_status_text (sc)); printf ("%d: Failed to obtain non-recursive-lock semaphore: %s\n", __LINE__, rtems_status_text (sc));
else if (diff < (2 * ticksPerSecond + 1)) else if (diff < (2 * ticksPerSecond))
printf ("%d: Obtained obtain non-recursive-lock semaphore too quickly -- %d ticks\n", __LINE__, diff); printf ("%d: Obtained obtain non-recursive-lock semaphore too quickly -- %d ticks not %d ticks\n", __LINE__, diff, (2 * ticksPerSecond) );
} }
puts( "*** END OF SP29 ***" );
exit (0); exit (0);
} }

4
c/src/tests/sptests/sp29/sp29.scn
View File

@@ -0,0 +1,4 @@
*** SP29 - SIMPLE SEMAPHORE TEST ***
This test only prints on errors.
*** END OF SP29 ***

14
testsuites/sptests/sp29/init.c
View File

@@ -67,6 +67,9 @@ rtems_task Init (rtems_task_argument ignored)
rtems_status_code sc; rtems_status_code sc;
rtems_interval then, now; rtems_interval then, now;
puts( "*** SP29 - SIMPLE SEMAPHORE TEST ***" );
puts( "This test only prints on errors." );
sc = rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond); sc = rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond);
if (sc != RTEMS_SUCCESSFUL) { if (sc != RTEMS_SUCCESSFUL) {
printf ("Can't get ticks per second: %s\n", rtems_status_text (sc)); printf ("Can't get ticks per second: %s\n", rtems_status_text (sc));
@@ -83,7 +86,7 @@ rtems_task Init (rtems_task_argument ignored)
} }
sc = rtems_semaphore_create (rtems_build_name ('S', 'M', 'n', 'c'), sc = rtems_semaphore_create (rtems_build_name ('S', 'M', 'n', 'c'),
1, 1,
RTEMS_PRIORITY|RTEMS_BINARY_SEMAPHORE|RTEMS_NO_NESTING_ALLOWED|RTEMS_INHERIT_PRIORITY |RTEMS_NO_PRIORITY_CEILING|RTEMS_LOCAL, RTEMS_PRIORITY|RTEMS_SIMPLE_BINARY_SEMAPHORE|RTEMS_INHERIT_PRIORITY |RTEMS_NO_PRIORITY_CEILING|RTEMS_LOCAL,
0, 0,
&semnorec); &semnorec);
if (sc != RTEMS_SUCCESSFUL) { if (sc != RTEMS_SUCCESSFUL) {
@@ -151,8 +154,8 @@ rtems_task Init (rtems_task_argument ignored)
if (sc == RTEMS_SUCCESSFUL) { if (sc == RTEMS_SUCCESSFUL) {
printf ("%d: Reobtain non-recursive-lock semaphore -- and should not have.\n", __LINE__); printf ("%d: Reobtain non-recursive-lock semaphore -- and should not have.\n", __LINE__);
} }
else if (sc != RTEMS_UNSATISFIED) { else if (sc != RTEMS_TIMEOUT) {
printf ("%d: Reobtain non-recursive-lock semaphore failed, but error is %d (%s), not RTEMS_UNSATISFIED.\n", __LINE__, sc, rtems_status_text (sc)); printf ("%d: Reobtain non-recursive-lock semaphore failed, but error is %d (%s), not RTEMS_TIMEOUT.\n", __LINE__, sc, rtems_status_text (sc));
} }
if ((then - now) < 4) if ((then - now) < 4)
printf ("%d: Reobtain non-recursive-lock semaphore failed without timeout.\n", __LINE__); printf ("%d: Reobtain non-recursive-lock semaphore failed without timeout.\n", __LINE__);
@@ -168,9 +171,10 @@ rtems_task Init (rtems_task_argument ignored)
then = now; then = now;
if (sc != RTEMS_SUCCESSFUL) if (sc != RTEMS_SUCCESSFUL)
printf ("%d: Failed to obtain non-recursive-lock semaphore: %s\n", __LINE__, rtems_status_text (sc)); printf ("%d: Failed to obtain non-recursive-lock semaphore: %s\n", __LINE__, rtems_status_text (sc));
else if (diff < (2 * ticksPerSecond + 1)) else if (diff < (2 * ticksPerSecond))
printf ("%d: Obtained obtain non-recursive-lock semaphore too quickly -- %d ticks\n", __LINE__, diff); printf ("%d: Obtained obtain non-recursive-lock semaphore too quickly -- %d ticks not %d ticks\n", __LINE__, diff, (2 * ticksPerSecond) );
} }
puts( "*** END OF SP29 ***" );
exit (0); exit (0);
} }

4
testsuites/sptests/sp29/sp29.scn
View File

@@ -0,0 +1,4 @@
*** SP29 - SIMPLE SEMAPHORE TEST ***
This test only prints on errors.
*** END OF SP29 ***