diff options
| -rw-r--r-- | c/src/tests/support/include/tmacros.h | 9 | ||||
| -rw-r--r-- | testsuites/support/include/tmacros.h | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/c/src/tests/support/include/tmacros.h b/c/src/tests/support/include/tmacros.h index 8b3619a639..cfa8684057 100644 --- a/c/src/tests/support/include/tmacros.h +++ b/c/src/tests/support/include/tmacros.h @@ -62,15 +62,20 @@ extern "C" { #define fatal_directive_status( _stat, _desired, _msg ) \ fatal_directive_status_with_level( _stat, _desired, _msg, 0 ) -#define fatal_directive_status_with_level( _stat, _desired, _msg, _level ) \ +#define fatal_directive_check_status_only( _stat, _desired, _msg ) \ do { \ - check_dispatch_disable_level( _level ); \ if ( (_stat) != (_desired) ) { \ printf( "\n%s FAILED -- expected (%s) got (%s)\n", \ (_msg), rtems_status_text(_desired), rtems_status_text(_stat) ); \ fflush(stdout); \ exit( _stat ); \ } \ + } while ( 0 ) + +#define fatal_directive_status_with_level( _stat, _desired, _msg, _level ) \ + do { \ + check_dispatch_disable_level( _level ); \ + fatal_directive_check_status_only( _stat, _desired, _msg ); \ } while ( 0 ) /* diff --git a/testsuites/support/include/tmacros.h b/testsuites/support/include/tmacros.h index 8b3619a639..cfa8684057 100644 --- a/testsuites/support/include/tmacros.h +++ b/testsuites/support/include/tmacros.h @@ -62,15 +62,20 @@ extern "C" { #define fatal_directive_status( _stat, _desired, _msg ) \ fatal_directive_status_with_level( _stat, _desired, _msg, 0 ) -#define fatal_directive_status_with_level( _stat, _desired, _msg, _level ) \ +#define fatal_directive_check_status_only( _stat, _desired, _msg ) \ do { \ - check_dispatch_disable_level( _level ); \ if ( (_stat) != (_desired) ) { \ printf( "\n%s FAILED -- expected (%s) got (%s)\n", \ (_msg), rtems_status_text(_desired), rtems_status_text(_stat) ); \ fflush(stdout); \ exit( _stat ); \ } \ + } while ( 0 ) + +#define fatal_directive_status_with_level( _stat, _desired, _msg, _level ) \ + do { \ + check_dispatch_disable_level( _level ); \ + fatal_directive_check_status_only( _stat, _desired, _msg ); \ } while ( 0 ) /* |