diff options
Diffstat (limited to 'testsuites/sptests/sp69/init.c')
| -rw-r--r-- | testsuites/sptests/sp69/init.c | 64 |
1 files changed, 22 insertions, 42 deletions
diff --git a/testsuites/sptests/sp69/init.c b/testsuites/sptests/sp69/init.c index ecc384678b..ac6f58cebe 100644 --- a/testsuites/sptests/sp69/init.c +++ b/testsuites/sptests/sp69/init.c @@ -55,15 +55,10 @@ rtems_task Init( /* Check status values. */ rtems_test_assert( period_status.owner == rtems_task_self() ); rtems_test_assert( period_status.state == RATE_MONOTONIC_INACTIVE ); - #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ - rtems_test_assert( period_status.since_last_period.tv_sec == 0 ); - rtems_test_assert( period_status.since_last_period.tv_nsec == 0 ); - rtems_test_assert( period_status.executed_since_last_period.tv_sec == 0 ); - rtems_test_assert( period_status.executed_since_last_period.tv_nsec == 0 ); - #else - rtems_test_assert( period_status.since_last_period == 0 ); - rtems_test_assert( period_status.executed_since_last_period == 0 ); - #endif + rtems_test_assert( period_status.since_last_period.tv_sec == 0 ); + rtems_test_assert( period_status.since_last_period.tv_nsec == 0 ); + rtems_test_assert( period_status.executed_since_last_period.tv_sec == 0 ); + rtems_test_assert( period_status.executed_since_last_period.tv_nsec == 0 ); /* * Check get_status error cases. @@ -113,40 +108,25 @@ rtems_task Init( directive_failed( status, "rate_monotonic_get_status" ); /* Check status values. */ - #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ /* Note: POSIX mandates struct timespec->tv_nsec to be a "long" */ - printf( - "wall time should be ~600000000 is %ld\n", - period_status.since_last_period.tv_nsec - ); - printf( - "cpu time should be ~100000000 is %ld\n", - period_status.executed_since_last_period.tv_nsec - ); - rtems_test_assert( period_status.since_last_period.tv_sec == 0 ); - rtems_test_assert( period_status.since_last_period.tv_nsec >= 600000000 ); - rtems_test_assert( period_status.since_last_period.tv_nsec <= 610000000 ); - rtems_test_assert( period_status.executed_since_last_period.tv_sec == 0 ); - rtems_test_assert( - period_status.executed_since_last_period.tv_nsec >= 100000000 - ); - rtems_test_assert( - period_status.executed_since_last_period.tv_nsec <= 110000000 - ); - #else - printf( - "wall time should be ~60 is %" PRId32 "\n", - (int) period_status.since_last_period - ); - printf( - "cpu time should be ~10 is %" PRId32 "\n", - (int) period_status.executed_since_last_period - ); - rtems_test_assert( period_status.since_last_period >= 60 ); - rtems_test_assert( period_status.since_last_period <= 61 ); - rtems_test_assert( period_status.executed_since_last_period >= 10 ); - rtems_test_assert( period_status.executed_since_last_period <= 12 ); - #endif + printf( + "wall time should be ~600000000 is %ld\n", + period_status.since_last_period.tv_nsec + ); + printf( + "cpu time should be ~100000000 is %ld\n", + period_status.executed_since_last_period.tv_nsec + ); + rtems_test_assert( period_status.since_last_period.tv_sec == 0 ); + rtems_test_assert( period_status.since_last_period.tv_nsec >= 600000000 ); + rtems_test_assert( period_status.since_last_period.tv_nsec <= 610000000 ); + rtems_test_assert( period_status.executed_since_last_period.tv_sec == 0 ); + rtems_test_assert( + period_status.executed_since_last_period.tv_nsec >= 100000000 + ); + rtems_test_assert( + period_status.executed_since_last_period.tv_nsec <= 110000000 + ); /* ensure the missed periods are properly accounted for */ puts( "rtems_rate_monotonic_cancel - OK" ); |