From 500fcd5c880e3cd281dced795c88407e3e67b2af Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 8 Dec 2009 17:52:49 +0000 Subject: 2009-12-08 Joel Sherrill * block01/init.c, block02/init.c, block03/init.c, block04/init.c, block05/init.c, block07/init.c, bspcmdline01/init.c, stringto01/init.c, stringto01/stringto_test_template.h, termios01/init.c, termios01/termios_testdriver.c, termios02/init.c: Use rtems_test_assert() consistently instead of system assert(). rtems_test_assert() is designed to integrate into the RTEMS test suite infrastructure. --- testsuites/libtests/stringto01/init.c | 3 +-- .../libtests/stringto01/stringto_test_template.h | 30 +++++++++++----------- 2 files changed, 16 insertions(+), 17 deletions(-) (limited to 'testsuites/libtests/stringto01') diff --git a/testsuites/libtests/stringto01/init.c b/testsuites/libtests/stringto01/init.c index b8ba4e00a7..38fbda8d0f 100644 --- a/testsuites/libtests/stringto01/init.c +++ b/testsuites/libtests/stringto01/init.c @@ -1,5 +1,5 @@ /* - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -13,7 +13,6 @@ #include #include -#include /* Test pointer conversions */ #define TEST_STRING_TO_TYPE void * diff --git a/testsuites/libtests/stringto01/stringto_test_template.h b/testsuites/libtests/stringto01/stringto_test_template.h index a351b5d964..70f8e0321a 100644 --- a/testsuites/libtests/stringto01/stringto_test_template.h +++ b/testsuites/libtests/stringto01/stringto_test_template.h @@ -43,7 +43,7 @@ void TEST_STRING_TO_NAME(void) #elif defined(STRING_TO_POINTER) || defined(STRING_TO_FLOAT) status = STRING_TO_NAME_METHOD( GOOD_VALUE_STRING, NULL, &endptr ); #endif - assert( status == RTEMS_INVALID_ADDRESS ); + rtems_test_assert( status == RTEMS_INVALID_ADDRESS ); /* Basic conversion works for return value, return end pointer */ puts( @@ -55,8 +55,8 @@ void TEST_STRING_TO_NAME(void) #elif defined(STRING_TO_POINTER) || defined(STRING_TO_FLOAT) status = STRING_TO_NAME_METHOD( GOOD_VALUE_STRING, &value, NULL ); #endif - assert( status == RTEMS_SUCCESSFUL ); - assert( value == (TEST_STRING_TO_TYPE)GOOD_VALUE ); + rtems_test_assert( status == RTEMS_SUCCESSFUL ); + rtems_test_assert( value == (TEST_STRING_TO_TYPE)GOOD_VALUE ); /* Basic conversion works for return value */ endptr = NULL; @@ -69,9 +69,9 @@ void TEST_STRING_TO_NAME(void) #elif defined(STRING_TO_POINTER) || defined(STRING_TO_FLOAT) status = STRING_TO_NAME_METHOD( GOOD_VALUE_STRING, &value, &endptr ); #endif - assert( status == RTEMS_SUCCESSFUL ); - assert( endptr ); - assert( value == (TEST_STRING_TO_TYPE)GOOD_VALUE ); + rtems_test_assert( status == RTEMS_SUCCESSFUL ); + rtems_test_assert( endptr ); + rtems_test_assert( value == (TEST_STRING_TO_TYPE)GOOD_VALUE ); /* Bad conversion works for return value */ endptr = NULL; @@ -84,8 +84,8 @@ void TEST_STRING_TO_NAME(void) #elif defined(STRING_TO_POINTER) || defined(STRING_TO_FLOAT) status = STRING_TO_NAME_METHOD( BAD_VALUE_STRING, &value, &endptr ); #endif - assert( status == RTEMS_NOT_DEFINED ); - assert( endptr ); + rtems_test_assert( status == RTEMS_NOT_DEFINED ); + rtems_test_assert( endptr ); /* Conversion of empty string */ endptr = NULL; @@ -99,9 +99,9 @@ void TEST_STRING_TO_NAME(void) #elif defined(STRING_TO_POINTER) || defined(STRING_TO_FLOAT) status = STRING_TO_NAME_METHOD( "", &value, &endptr ); #endif - assert( status == RTEMS_NOT_DEFINED ); - assert( endptr ); - assert( value == (TEST_STRING_TO_TYPE)0 ); + rtems_test_assert( status == RTEMS_NOT_DEFINED ); + rtems_test_assert( endptr ); + rtems_test_assert( value == (TEST_STRING_TO_TYPE)0 ); /* Conversion of number that is too large */ #if defined(TEST_TOO_LARGE_STRING) @@ -117,8 +117,8 @@ void TEST_STRING_TO_NAME(void) #endif if ( status != RTEMS_INVALID_NUMBER ) printf( "ERROR = %s\n", rtems_status_text(status) ); - assert( status == RTEMS_INVALID_NUMBER ); - assert( endptr ); + rtems_test_assert( status == RTEMS_INVALID_NUMBER ); + rtems_test_assert( endptr ); #endif /* Conversion of number that is too small */ @@ -132,8 +132,8 @@ void TEST_STRING_TO_NAME(void) #elif defined(STRING_TO_POINTER) || defined(STRING_TO_FLOAT) status = STRING_TO_NAME_METHOD( TEST_TOO_SMALL_STRING, &value, &endptr ); #endif - assert( status == RTEMS_INVALID_NUMBER ); - assert( endptr ); + rtems_test_assert( status == RTEMS_INVALID_NUMBER ); + rtems_test_assert( endptr ); #endif } -- cgit v1.2.3