From e72505f84aa8d8730e46d955a2722af361112e4f Mon Sep 17 00:00:00 2001 From: solar Date: Fri, 1 Oct 2010 18:28:28 +0000 Subject: [PATCH] Streamlined printf testing. --- functions/_PDCLIB/print.c | 252 +----------------- functions/stdio/fprintf.c | 8 +- functions/stdio/printf.c | 8 +- functions/stdio/snprintf.c | 8 +- functions/stdio/sprintf.c | 8 +- functions/stdio/vfprintf.c | 8 +- functions/stdio/vprintf.c | 8 +- functions/stdio/vsnprintf.c | 10 +- functions/stdio/vsprintf.c | 8 +- platform/example/testing/printf_reference.txt | 2 +- testing/fprintf_reftest.incl | 12 +- testing/printf_testcases.incl | 200 +++++++------- 12 files changed, 145 insertions(+), 387 deletions(-) diff --git a/functions/_PDCLIB/print.c b/functions/_PDCLIB/print.c index 27b4bc2..8d19fe5 100644 --- a/functions/_PDCLIB/print.c +++ b/functions/_PDCLIB/print.c @@ -512,13 +512,13 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status #include #include -static int testprintf( char * buffer, size_t n, const char * format, ... ) +static int testprintf( char * buffer, const char * format, ... ) { /* Members: base, flags, n, i, current, s, width, prec, stream, arg */ struct _PDCLIB_status_t status; status.base = 0; status.flags = 0; - status.n = n; + status.n = 100; status.i = 0; status.current = 0; status.s = buffer; @@ -538,255 +538,13 @@ static int testprintf( char * buffer, size_t n, const char * format, ... ) #define TEST_CONVERSION_ONLY -#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \ - else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); } +#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \ + else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, target, #x ); } int main( void ) { - char buffer[100]; + char target[100]; #include "printf_testcases.incl" - -#if 0 - char buffer[100]; - TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 ); - TESTCASE( strcmp( buffer, "-128" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 ); - TESTCASE( strcmp( buffer, "127" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hhd", 0 ) == 1 ); - TESTCASE( strcmp( buffer, "0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MIN ) == 6 ); - TESTCASE( strcmp( buffer, "-32768" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MAX ) == 5 ); - TESTCASE( strcmp( buffer, "32767" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hd", 0 ) == 1 ); - TESTCASE( strcmp( buffer, "0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%d", 0 ) == 1 ); - TESTCASE( strcmp( buffer, "0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%ld", LONG_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%ld", LONG_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%ld", 0l ) == 1 ); - TESTCASE( strcmp( buffer, "0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MIN ) == 20 ); - TESTCASE( strcmp( buffer, "-9223372036854775808" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MAX ) == 19 ); - TESTCASE( strcmp( buffer, "9223372036854775807" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%lld", 0ll ) ); - TESTCASE( strcmp( buffer, "0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hhu", UCHAR_MAX ) == 3 ); - TESTCASE( strcmp( buffer, "255" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hhu", (unsigned char)-1 ) == 3 ); - TESTCASE( strcmp( buffer, "255" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hu", USHRT_MAX ) == 5 ); - TESTCASE( strcmp( buffer, "65535" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hu", (unsigned short)-1 ) == 5 ); - TESTCASE( strcmp( buffer, "65535" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%u", UINT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%u", -1u ) == 10 ); - TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%lu", ULONG_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%lu", -1ul ) == 10 ); - TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%llu", ULLONG_MAX ) == 20 ); - TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%llu", -1ull ) == 20 ); - TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%X", UINT_MAX ) == 8 ); - TESTCASE( strcmp( buffer, "FFFFFFFF" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#X", -1u ) == 10 ); - TESTCASE( strcmp( buffer, "0XFFFFFFFF" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%x", UINT_MAX ) == 8 ); - TESTCASE( strcmp( buffer, "ffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#x", -1u ) == 10 ); - TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%o", UINT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, "37777777777" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#o", -1u ) == 12 ); - TESTCASE( strcmp( buffer, "037777777777" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+d", 0 ) == 2 ); - TESTCASE( strcmp( buffer, "+0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+u", UINT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+u", -1u ) == 10 ); - TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "% d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "% d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, " 2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "% d", 0 ) == 2 ); - TESTCASE( strcmp( buffer, " 0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "% u", UINT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "% u", -1u ) == 10 ); - TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%9d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%9d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%10d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%10d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%11d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%11d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, " 2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%12d", INT_MIN ) == 12 ); - TESTCASE( strcmp( buffer, " -2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%12d", INT_MAX ) == 12 ); - TESTCASE( strcmp( buffer, " 2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-9d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-9d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-10d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-10d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-11d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-11d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, "2147483647 " ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-12d", INT_MIN ) == 12 ); - TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-12d", INT_MAX ) == 12 ); - TESTCASE( strcmp( buffer, "2147483647 " ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%09d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%09d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%010d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%010d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%011d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%011d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, "02147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%012d", INT_MIN ) == 12 ); - TESTCASE( strcmp( buffer, "-02147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%012d", INT_MAX ) == 12 ); - TESTCASE( strcmp( buffer, "002147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-09d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-09d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-010d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-010d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-011d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-011d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, "2147483647 " ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-012d", INT_MIN ) == 12 ); - TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-012d", INT_MAX ) == 12 ); - TESTCASE( strcmp( buffer, "2147483647 " ) == 0 ); - TESTCASE( testprintf( buffer, 8, "%9d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483" ) == 0 ); - TESTCASE( testprintf( buffer, 8, "%9d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-214748" ) == 0 ); - TESTCASE( testprintf( buffer, 9, "%9d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "21474836" ) == 0 ); - TESTCASE( testprintf( buffer, 9, "%9d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483" ) == 0 ); - TESTCASE( testprintf( buffer, 10, "%9d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "214748364" ) == 0 ); - TESTCASE( testprintf( buffer, 10, "%9d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-21474836" ) == 0 ); - TESTCASE( testprintf( buffer, 9, "%10d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "21474836" ) == 0 ); - TESTCASE( testprintf( buffer, 9, "%10d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483" ) == 0 ); - TESTCASE( testprintf( buffer, 10, "%10d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "214748364" ) == 0 ); - TESTCASE( testprintf( buffer, 10, "%10d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-21474836" ) == 0 ); - TESTCASE( testprintf( buffer, 11, "%10d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 11, "%10d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-214748364" ) == 0 ); - TESTCASE( testprintf( buffer, 10, "%11d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, " 21474836" ) == 0 ); - TESTCASE( testprintf( buffer, 10, "%11d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-21474836" ) == 0 ); - TESTCASE( testprintf( buffer, 11, "%11d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, " 214748364" ) == 0 ); - TESTCASE( testprintf( buffer, 11, "%11d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-214748364" ) == 0 ); - TESTCASE( testprintf( buffer, 12, "%11d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, " 2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 12, "%11d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 11, "%12d", INT_MAX ) == 12 ); - TESTCASE( strcmp( buffer, " 21474836" ) == 0 ); - TESTCASE( testprintf( buffer, 11, "%12d", INT_MIN ) == 12 ); - TESTCASE( strcmp( buffer, " -21474836" ) == 0 ); - TESTCASE( testprintf( buffer, 12, "%12d", INT_MAX ) == 12 ); - TESTCASE( strcmp( buffer, " 214748364" ) == 0 ); - TESTCASE( testprintf( buffer, 12, "%12d", INT_MIN ) == 12 ); - TESTCASE( strcmp( buffer, " -214748364" ) == 0 ); - TESTCASE( testprintf( buffer, 13, "%12d", INT_MAX ) == 12 ); - TESTCASE( strcmp( buffer, " 2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 13, "%12d", INT_MIN ) == 12 ); - TESTCASE( strcmp( buffer, " -2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%030.20d", INT_MAX ) == 30 ); - TESTCASE( strcmp( buffer, " 00000000002147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%.6x", UINT_MAX ) == 8 ); - TESTCASE( strcmp( buffer, "ffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#6.3x", UINT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#3.6x", UINT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%.6d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%6.3d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%3.6d", INT_MIN ) == 11 ); - TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#0.6x", UINT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#06.3x", UINT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#03.6x", UINT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#0.6d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#06.3d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#03.6d", INT_MAX ) == 10 ); - TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#+.6d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#+6.3d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#+3.6d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+0.6d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+06.3d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+03.6d", INT_MAX ) == 11 ); - TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%c", 'x' ) == 1 ); - TESTCASE( strcmp( buffer, "x" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%s", "abcdef" ) == 6 ); - TESTCASE( strcmp( buffer, "abcdef" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 ); - TESTCASE( strcmp( buffer, "0xdeadbeef" ) == 0 ); -#endif return TEST_RESULTS; } diff --git a/functions/stdio/fprintf.c b/functions/stdio/fprintf.c index a7cef0b..db6a6a1 100644 --- a/functions/stdio/fprintf.c +++ b/functions/stdio/fprintf.c @@ -28,16 +28,16 @@ int fprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCL #include #include <_PDCLIB_test.h> -#define testprintf( stream, n, format, ... ) fprintf( stream, format, __VA_ARGS__ ) +#define testprintf( stream, format, ... ) fprintf( stream, format, __VA_ARGS__ ) #define TESTCASE_SPRINTF( x ) int main( void ) { - FILE * buffer; - TESTCASE( ( buffer = fopen( "testing/testfile", "wb" ) ) != NULL ); + FILE * target; + TESTCASE( ( target = fopen( "testing/testfile", "wb" ) ) != NULL ); #include "printf_testcases.incl" - TESTCASE( fclose( buffer ) == 0 ); + TESTCASE( fclose( target ) == 0 ); #include "fprintf_reftest.incl" TESTCASE( remove( "testing/testfile" ) == 0 ); return TEST_RESULTS; diff --git a/functions/stdio/printf.c b/functions/stdio/printf.c index ef99d2c..ddc87cc 100644 --- a/functions/stdio/printf.c +++ b/functions/stdio/printf.c @@ -28,16 +28,16 @@ int printf( const char * _PDCLIB_restrict format, ... ) #include #include <_PDCLIB_test.h> -#define testprintf( stream, n, format, ... ) printf( format, __VA_ARGS__ ) +#define testprintf( stream, format, ... ) printf( format, __VA_ARGS__ ) #define TESTCASE_SPRINTF( x ) int main( void ) { - FILE * buffer; - TESTCASE( ( buffer = freopen( testfile, "wb", stdout ) ) != NULL ); + FILE * target; + TESTCASE( ( target = freopen( testfile, "wb", stdout ) ) != NULL ); #include "printf_testcases.incl" - TESTCASE( fclose( buffer ) == 0 ); + TESTCASE( fclose( target ) == 0 ); #include "fprintf_reftest.incl" TESTCASE( remove( testfile ) == 0 ); return TEST_RESULTS; diff --git a/functions/stdio/snprintf.c b/functions/stdio/snprintf.c index cf30e40..851aefb 100644 --- a/functions/stdio/snprintf.c +++ b/functions/stdio/snprintf.c @@ -29,14 +29,14 @@ int snprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restrict #include #include -#define testprintf( s, n, format, ... ) snprintf( s, n, format, __VA_ARGS__ ) +#define testprintf( s, format, ... ) snprintf( s, 100, format, __VA_ARGS__ ) -#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \ - else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); } +#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \ + else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, target, #x ); } int main( void ) { - char buffer[100]; + char target[100]; #include "printf_testcases.incl" return TEST_RESULTS; } diff --git a/functions/stdio/sprintf.c b/functions/stdio/sprintf.c index 9b0ac81..ca7e2d1 100644 --- a/functions/stdio/sprintf.c +++ b/functions/stdio/sprintf.c @@ -30,14 +30,14 @@ int sprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, .. #include #include -#define testprintf( s, n, format, ... ) sprintf( s, format, __VA_ARGS__ ) +#define testprintf( s, format, ... ) sprintf( s, format, __VA_ARGS__ ) -#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \ - else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); } +#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \ + else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, target, #x ); } int main( void ) { - char buffer[100]; + char target[100]; #include "printf_testcases.incl" return TEST_RESULTS; } diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c index 2b216db..6a5a781 100644 --- a/functions/stdio/vfprintf.c +++ b/functions/stdio/vfprintf.c @@ -54,7 +54,7 @@ int vfprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDC #include #include <_PDCLIB_test.h> -static int testprintf( FILE * stream, size_t n, const char * format, ... ) +static int testprintf( FILE * stream, const char * format, ... ) { int i; va_list arg; @@ -68,10 +68,10 @@ static int testprintf( FILE * stream, size_t n, const char * format, ... ) int main( void ) { - FILE * buffer; - TESTCASE( ( buffer = fopen( testfile, "wb" ) ) != NULL ); + FILE * target; + TESTCASE( ( target = fopen( testfile, "wb" ) ) != NULL ); #include "printf_testcases.incl" - TESTCASE( fclose( buffer ) == 0 ); + TESTCASE( fclose( target ) == 0 ); #include "fprintf_reftest.incl" TESTCASE( remove( testfile ) == 0 ); return TEST_RESULTS; diff --git a/functions/stdio/vprintf.c b/functions/stdio/vprintf.c index a02c625..904f791 100644 --- a/functions/stdio/vprintf.c +++ b/functions/stdio/vprintf.c @@ -23,7 +23,7 @@ int vprintf( const char * _PDCLIB_restrict format, _PDCLIB_va_list arg ) #include #include <_PDCLIB_test.h> -static int testprintf( FILE * stream, size_t n, const char * format, ... ) +static int testprintf( FILE * stream, const char * format, ... ) { int i; va_list arg; @@ -37,10 +37,10 @@ static int testprintf( FILE * stream, size_t n, const char * format, ... ) int main( void ) { - FILE * buffer; - TESTCASE( ( buffer = freopen( testfile, "wb", stdout ) ) != NULL ); + FILE * target; + TESTCASE( ( target = freopen( testfile, "wb", stdout ) ) != NULL ); #include "printf_testcases.incl" - TESTCASE( fclose( buffer ) == 0 ); + TESTCASE( fclose( target ) == 0 ); #include "fprintf_reftest.incl" TESTCASE( remove( testfile ) == 0 ); return TEST_RESULTS; diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c index 9768c0a..165ed54 100644 --- a/functions/stdio/vsnprintf.c +++ b/functions/stdio/vsnprintf.c @@ -54,22 +54,22 @@ int vsnprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restric #include #include -static int testprintf( char * s, size_t n, const char * format, ... ) +static int testprintf( char * s, const char * format, ... ) { int i; va_list arg; va_start( arg, format ); - i = vsnprintf( s, n, format, arg ); + i = vsnprintf( s, 100, format, arg ); va_end( arg ); return i; } -#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \ - else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); } +#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \ + else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, target, #x ); } int main( void ) { - char buffer[100]; + char target[100]; #include "printf_testcases.incl" return TEST_RESULTS; } diff --git a/functions/stdio/vsprintf.c b/functions/stdio/vsprintf.c index d3920fa..803485e 100644 --- a/functions/stdio/vsprintf.c +++ b/functions/stdio/vsprintf.c @@ -26,7 +26,7 @@ int vsprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, v #include #include -static int testprintf( char * s, size_t n, const char * format, ... ) +static int testprintf( char * s, const char * format, ... ) { int i; va_list arg; @@ -36,12 +36,12 @@ static int testprintf( char * s, size_t n, const char * format, ... ) return i; } -#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \ - else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); } +#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \ + else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, target, #x ); } int main( void ) { - char buffer[100]; + char target[100]; #include "printf_testcases.incl" return TEST_RESULTS; } diff --git a/platform/example/testing/printf_reference.txt b/platform/example/testing/printf_reference.txt index 7f922eb..afb6a59 100644 --- a/platform/example/testing/printf_reference.txt +++ b/platform/example/testing/printf_reference.txt @@ -1 +1 @@ --1281270-32768327670-214748364821474836470-214748364821474836470-922337203685477580892233720368547758070255255655356553542949672954294967295429496729542949672951844674407370955161518446744073709551615FFFFFFFF0XFFFFFFFFffffffff0xffffffff37777777777037777777777%.0#o-2147483648+2147483647+042949672954294967295-2147483648 2147483647 042949672954294967295-21474836482147483647-21474836482147483647-2147483648 2147483647 -2147483648 2147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647 -21474836482147483647-21474836482147483647-214748364802147483647-02147483648002147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647 00000000002147483647ffffffff0xffffffff0xffffffff-2147483648-2147483648-21474836480xffffffff0xffffffff0xffffffff214748364721474836472147483647+2147483647+2147483647+2147483647+2147483647+2147483647+2147483647- 2147483647- 2147483647 % -2147483648xabcdef0xdeadbeef123456789 \ No newline at end of file +-1281270-32768327670-214748364821474836470-214748364821474836470-922337203685477580892233720368547758070255255655356553542949672954294967295429496729542949672951844674407370955161518446744073709551615FFFFFFFF0XFFFFFFFFffffffff0xffffffff37777777777037777777777%.0#o-2147483648+2147483647+042949672954294967295-2147483648 2147483647 042949672954294967295-21474836482147483647-21474836482147483647-2147483648 2147483647 -2147483648 2147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647 -21474836482147483647-21474836482147483647-214748364802147483647-02147483648002147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647 00000000002147483647ffffffff0xffffffff0xffffffff-2147483648-2147483648-21474836480xffffffff0xffffffff0xffffffff214748364721474836472147483647+2147483647+2147483647+2147483647+2147483647+2147483647+2147483647- 2147483647- 2147483647 % -2147483648xabcdef0xdeadbeef0x0010123456789 \ No newline at end of file diff --git a/testing/fprintf_reftest.incl b/testing/fprintf_reftest.incl index e683ded..3c6ae4b 100644 --- a/testing/fprintf_reftest.incl +++ b/testing/fprintf_reftest.incl @@ -2,11 +2,11 @@ char readbuffer[2000]; char refbuffer[2000]; size_t readcounter; - TESTCASE( ( buffer = fopen( testfile, "r" ) ) != NULL ); - readcounter = fread( readbuffer, 1, 2000, buffer ); - TESTCASE( fclose( buffer ) == 0 ); - TESTCASE( ( buffer = fopen( "testing/printf_reference.txt", "r" ) ) != NULL ); - TESTCASE( fread( refbuffer, 1, 2000, buffer ) == readcounter ); - TESTCASE( fclose( buffer ) == 0 ); + TESTCASE( ( target = fopen( testfile, "r" ) ) != NULL ); + readcounter = fread( readbuffer, 1, 2000, target ); + TESTCASE( fclose( target ) == 0 ); + TESTCASE( ( target = fopen( "testing/printf_reference.txt", "r" ) ) != NULL ); + TESTCASE( fread( refbuffer, 1, 2000, target ) == readcounter ); + TESTCASE( fclose( target ) == 0 ); TESTCASE( memcmp( readbuffer, refbuffer, readcounter ) == 0 ); } diff --git a/testing/printf_testcases.incl b/testing/printf_testcases.incl index b3e5ea7..c1c0a48 100644 --- a/testing/printf_testcases.incl +++ b/testing/printf_testcases.incl @@ -147,213 +147,213 @@ #endif - TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 ); + TESTCASE( testprintf( target, "%hhd", CHAR_MIN ) == 4 ); TESTCASE_SPRINTF( "-128" ); - TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 ); + TESTCASE( testprintf( target, "%hhd", CHAR_MAX ) == 3 ); TESTCASE_SPRINTF( "127" ); - TESTCASE( testprintf( buffer, 100, "%hhd", 0 ) == 1 ); + TESTCASE( testprintf( target, "%hhd", 0 ) == 1 ); TESTCASE_SPRINTF( "0" ); - TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MIN ) == 6 ); + TESTCASE( testprintf( target, "%hd", SHRT_MIN ) == 6 ); TESTCASE_SPRINTF( "-32768" ); - TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MAX ) == 5 ); + TESTCASE( testprintf( target, "%hd", SHRT_MAX ) == 5 ); TESTCASE_SPRINTF( "32767" ); - TESTCASE( testprintf( buffer, 100, "%hd", 0 ) == 1 ); + TESTCASE( testprintf( target, "%hd", 0 ) == 1 ); TESTCASE_SPRINTF( "0" ); - TESTCASE( testprintf( buffer, 100, "%d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%d", INT_MAX ) == INT_DIG ); + TESTCASE( testprintf( target, "%d", INT_MAX ) == INT_DIG ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%d", 0 ) == 1 ); + TESTCASE( testprintf( target, "%d", 0 ) == 1 ); TESTCASE_SPRINTF( "0" ); - TESTCASE( testprintf( buffer, 100, "%ld", LONG_MIN ) == LONG_DIG + 1 ); + TESTCASE( testprintf( target, "%ld", LONG_MIN ) == LONG_DIG + 1 ); TESTCASE_SPRINTF( "-" LONG_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%ld", LONG_MAX ) == LONG_DIG ); + TESTCASE( testprintf( target, "%ld", LONG_MAX ) == LONG_DIG ); TESTCASE_SPRINTF( LONG_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%ld", 0l ) == 1 ); + TESTCASE( testprintf( target, "%ld", 0l ) == 1 ); TESTCASE_SPRINTF( "0" ); - TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MIN ) == LLONG_DIG + 1 ); + TESTCASE( testprintf( target, "%lld", LLONG_MIN ) == LLONG_DIG + 1 ); TESTCASE_SPRINTF( "-" LLONG_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MAX ) == LLONG_DIG ); + TESTCASE( testprintf( target, "%lld", LLONG_MAX ) == LLONG_DIG ); TESTCASE_SPRINTF( LLONG_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%lld", 0ll ) ); + TESTCASE( testprintf( target, "%lld", 0ll ) ); TESTCASE_SPRINTF( "0" ); - TESTCASE( testprintf( buffer, 100, "%hhu", UCHAR_MAX ) == 3 ); + TESTCASE( testprintf( target, "%hhu", UCHAR_MAX ) == 3 ); TESTCASE_SPRINTF( "255" ); - TESTCASE( testprintf( buffer, 100, "%hhu", (unsigned char)-1 ) == 3 ); + TESTCASE( testprintf( target, "%hhu", (unsigned char)-1 ) == 3 ); TESTCASE_SPRINTF( "255" ); - TESTCASE( testprintf( buffer, 100, "%hu", USHRT_MAX ) == 5 ); + TESTCASE( testprintf( target, "%hu", USHRT_MAX ) == 5 ); TESTCASE_SPRINTF( "65535" ); - TESTCASE( testprintf( buffer, 100, "%hu", (unsigned short)-1 ) == 5 ); + TESTCASE( testprintf( target, "%hu", (unsigned short)-1 ) == 5 ); TESTCASE_SPRINTF( "65535" ); - TESTCASE( testprintf( buffer, 100, "%u", UINT_MAX ) == UINT_DIG ); + TESTCASE( testprintf( target, "%u", UINT_MAX ) == UINT_DIG ); TESTCASE_SPRINTF( UINT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%u", -1u ) == UINT_DIG ); + TESTCASE( testprintf( target, "%u", -1u ) == UINT_DIG ); TESTCASE_SPRINTF( UINT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%lu", ULONG_MAX ) == ULONG_DIG ); + TESTCASE( testprintf( target, "%lu", ULONG_MAX ) == ULONG_DIG ); TESTCASE_SPRINTF( ULONG_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%lu", -1ul ) == ULONG_DIG ); + TESTCASE( testprintf( target, "%lu", -1ul ) == ULONG_DIG ); TESTCASE_SPRINTF( ULONG_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%llu", ULLONG_MAX ) == ULLONG_DIG ); + TESTCASE( testprintf( target, "%llu", ULLONG_MAX ) == ULLONG_DIG ); TESTCASE_SPRINTF( ULLONG_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%llu", -1ull ) == ULLONG_DIG ); + TESTCASE( testprintf( target, "%llu", -1ull ) == ULLONG_DIG ); TESTCASE_SPRINTF( ULLONG_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%X", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 1 ); + TESTCASE( testprintf( target, "%X", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 1 ); TESTCASE_SPRINTF( "F" INT_HEXDIG ); - TESTCASE( testprintf( buffer, 100, "%#X", -1u ) == (int)strlen( INT_HEXDIG ) + 3 ); + TESTCASE( testprintf( target, "%#X", -1u ) == (int)strlen( INT_HEXDIG ) + 3 ); TESTCASE_SPRINTF( "0XF" INT_HEXDIG ); - TESTCASE( testprintf( buffer, 100, "%x", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 1 ); + TESTCASE( testprintf( target, "%x", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 1 ); TESTCASE_SPRINTF( "f" INT_hexdig ); - TESTCASE( testprintf( buffer, 100, "%#x", -1u ) == (int)strlen( INT_HEXDIG ) + 3 ); + TESTCASE( testprintf( target, "%#x", -1u ) == (int)strlen( INT_HEXDIG ) + 3 ); TESTCASE_SPRINTF( "0xf" INT_hexdig ); - TESTCASE( testprintf( buffer, 100, "%o", UINT_MAX ) == (int)strlen( INT_OCTDIG ) ); + TESTCASE( testprintf( target, "%o", UINT_MAX ) == (int)strlen( INT_OCTDIG ) ); TESTCASE_SPRINTF( INT_OCTDIG ); - TESTCASE( testprintf( buffer, 100, "%#o", -1u ) == (int)strlen( INT_OCTDIG ) + 1 ); + TESTCASE( testprintf( target, "%#o", -1u ) == (int)strlen( INT_OCTDIG ) + 1 ); TESTCASE_SPRINTF( "0" INT_OCTDIG ); /* TODO: This test case is broken, doesn't test what it was intended to. */ - TESTCASE( testprintf( buffer, 100, "%.0#o", 0 ) == 5 ); + TESTCASE( testprintf( target, "%.0#o", 0 ) == 5 ); TESTCASE_SPRINTF( "%.0#o" ); - TESTCASE( testprintf( buffer, 100, "%+d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%+d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%+d", INT_MAX ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%+d", INT_MAX ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%+d", 0 ) == 2 ); + TESTCASE( testprintf( target, "%+d", 0 ) == 2 ); TESTCASE_SPRINTF( "+0" ); - TESTCASE( testprintf( buffer, 100, "%+u", UINT_MAX ) == UINT_DIG ); + TESTCASE( testprintf( target, "%+u", UINT_MAX ) == UINT_DIG ); TESTCASE_SPRINTF( UINT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%+u", -1u ) == UINT_DIG ); + TESTCASE( testprintf( target, "%+u", -1u ) == UINT_DIG ); TESTCASE_SPRINTF( UINT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "% d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "% d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "% d", INT_MAX ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "% d", INT_MAX ) == INT_DIG + 1 ); TESTCASE_SPRINTF( " " INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "% d", 0 ) == 2 ); + TESTCASE( testprintf( target, "% d", 0 ) == 2 ); TESTCASE_SPRINTF( " 0" ); - TESTCASE( testprintf( buffer, 100, "% u", UINT_MAX ) == UINT_DIG ); + TESTCASE( testprintf( target, "% u", UINT_MAX ) == UINT_DIG ); TESTCASE_SPRINTF( UINT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "% u", -1u ) == UINT_DIG ); + TESTCASE( testprintf( target, "% u", -1u ) == UINT_DIG ); TESTCASE_SPRINTF( UINT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%" INT_DIG_LESS1 "d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%" INT_DIG_LESS1 "d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%" INT_DIG_LESS1 "d", INT_MAX ) == INT_DIG ); + TESTCASE( testprintf( target, "%" INT_DIG_LESS1 "d", INT_MAX ) == INT_DIG ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%" sym2s(INT_DIG) "d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%" sym2s(INT_DIG) "d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%" sym2s(INT_DIG) "d", INT_MAX ) == INT_DIG ); + TESTCASE( testprintf( target, "%" sym2s(INT_DIG) "d", INT_MAX ) == INT_DIG ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%" INT_DIG_PLUS1 "d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%" INT_DIG_PLUS1 "d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%" INT_DIG_PLUS1 "d", INT_MAX ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%" INT_DIG_PLUS1 "d", INT_MAX ) == INT_DIG + 1 ); TESTCASE_SPRINTF( " " INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%" INT_DIG_PLUS2 "d", INT_MIN ) == INT_DIG + 2 ); + TESTCASE( testprintf( target, "%" INT_DIG_PLUS2 "d", INT_MIN ) == INT_DIG + 2 ); TESTCASE_SPRINTF( " -" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%" INT_DIG_PLUS2 "d", INT_MAX ) == INT_DIG + 2 ); + TESTCASE( testprintf( target, "%" INT_DIG_PLUS2 "d", INT_MAX ) == INT_DIG + 2 ); TESTCASE_SPRINTF( " " INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%-" INT_DIG_LESS1 "d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%-" INT_DIG_LESS1 "d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%-" INT_DIG_LESS1 "d", INT_MAX ) == INT_DIG ); + TESTCASE( testprintf( target, "%-" INT_DIG_LESS1 "d", INT_MAX ) == INT_DIG ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%-" sym2s(INT_DIG) "d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%-" sym2s(INT_DIG) "d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%-" sym2s(INT_DIG) "d", INT_MAX ) == INT_DIG ); + TESTCASE( testprintf( target, "%-" sym2s(INT_DIG) "d", INT_MAX ) == INT_DIG ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%-" INT_DIG_PLUS1 "d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%-" INT_DIG_PLUS1 "d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%-" INT_DIG_PLUS1 "d", INT_MAX ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%-" INT_DIG_PLUS1 "d", INT_MAX ) == INT_DIG + 1 ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR " " ); - TESTCASE( testprintf( buffer, 100, "%-" INT_DIG_PLUS2 "d", INT_MIN ) == INT_DIG + 2 ); + TESTCASE( testprintf( target, "%-" INT_DIG_PLUS2 "d", INT_MIN ) == INT_DIG + 2 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR " " ); - TESTCASE( testprintf( buffer, 100, "%-" INT_DIG_PLUS2 "d", INT_MAX ) == INT_DIG + 2 ); + TESTCASE( testprintf( target, "%-" INT_DIG_PLUS2 "d", INT_MAX ) == INT_DIG + 2 ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR " " ); - TESTCASE( testprintf( buffer, 100, "%0" INT_DIG_LESS1 "d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%0" INT_DIG_LESS1 "d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%0" INT_DIG_LESS1 "d", INT_MAX ) == INT_DIG ); + TESTCASE( testprintf( target, "%0" INT_DIG_LESS1 "d", INT_MAX ) == INT_DIG ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%0" sym2s(INT_DIG) "d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%0" sym2s(INT_DIG) "d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%0" sym2s(INT_DIG) "d", INT_MAX ) == INT_DIG ); + TESTCASE( testprintf( target, "%0" sym2s(INT_DIG) "d", INT_MAX ) == INT_DIG ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%0" INT_DIG_PLUS1 "d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%0" INT_DIG_PLUS1 "d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%0" INT_DIG_PLUS1 "d", INT_MAX ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%0" INT_DIG_PLUS1 "d", INT_MAX ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "0" INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%0" INT_DIG_PLUS2 "d", INT_MIN ) == INT_DIG + 2 ); + TESTCASE( testprintf( target, "%0" INT_DIG_PLUS2 "d", INT_MIN ) == INT_DIG + 2 ); TESTCASE_SPRINTF( "-0" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%0" INT_DIG_PLUS2 "d", INT_MAX ) == INT_DIG + 2 ); + TESTCASE( testprintf( target, "%0" INT_DIG_PLUS2 "d", INT_MAX ) == INT_DIG + 2 ); TESTCASE_SPRINTF( "00" INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%-0" INT_DIG_LESS1 "d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%-0" INT_DIG_LESS1 "d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%-0" INT_DIG_LESS1 "d", INT_MAX ) == INT_DIG ); + TESTCASE( testprintf( target, "%-0" INT_DIG_LESS1 "d", INT_MAX ) == INT_DIG ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%-0" sym2s(INT_DIG) "d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%-0" sym2s(INT_DIG) "d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%-0" sym2s(INT_DIG) "d", INT_MAX ) == INT_DIG ); + TESTCASE( testprintf( target, "%-0" sym2s(INT_DIG) "d", INT_MAX ) == INT_DIG ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%-0" INT_DIG_PLUS1 "d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%-0" INT_DIG_PLUS1 "d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%-0" INT_DIG_PLUS1 "d", INT_MAX ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%-0" INT_DIG_PLUS1 "d", INT_MAX ) == INT_DIG + 1 ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR " " ); - TESTCASE( testprintf( buffer, 100, "%-0" INT_DIG_PLUS2 "d", INT_MIN ) == INT_DIG + 2 ); + TESTCASE( testprintf( target, "%-0" INT_DIG_PLUS2 "d", INT_MIN ) == INT_DIG + 2 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR " " ); - TESTCASE( testprintf( buffer, 100, "%-0" INT_DIG_PLUS2 "d", INT_MAX ) == INT_DIG + 2 ); + TESTCASE( testprintf( target, "%-0" INT_DIG_PLUS2 "d", INT_MAX ) == INT_DIG + 2 ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR " " ); /* FIXME: This test not yet 32/64 bit agnostic */ - TESTCASE( testprintf( buffer, 100, "%030.20d", INT_MAX ) == 30 ); + TESTCASE( testprintf( target, "%030.20d", INT_MAX ) == 30 ); TESTCASE_SPRINTF( " 00000000002147483647" ); - TESTCASE( testprintf( buffer, 100, "%.6x", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 1 ); + TESTCASE( testprintf( target, "%.6x", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 1 ); TESTCASE_SPRINTF( "f" INT_hexdig ); - TESTCASE( testprintf( buffer, 100, "%#6.3x", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 3 ); + TESTCASE( testprintf( target, "%#6.3x", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 3 ); TESTCASE_SPRINTF( "0xf" INT_hexdig ); - TESTCASE( testprintf( buffer, 100, "%#3.6x", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 3 ); + TESTCASE( testprintf( target, "%#3.6x", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 3 ); TESTCASE_SPRINTF( "0xf" INT_hexdig ); - TESTCASE( testprintf( buffer, 100, "%.6d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%.6d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%6.3d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%6.3d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%3.6d", INT_MIN ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%3.6d", INT_MIN ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%#0.6x", UINT_MAX ) == UINT_DIG ); + TESTCASE( testprintf( target, "%#0.6x", UINT_MAX ) == UINT_DIG ); TESTCASE_SPRINTF( "0xf" INT_hexdig ); - TESTCASE( testprintf( buffer, 100, "%#06.3x", UINT_MAX ) == UINT_DIG ); + TESTCASE( testprintf( target, "%#06.3x", UINT_MAX ) == UINT_DIG ); TESTCASE_SPRINTF( "0xf" INT_hexdig ); - TESTCASE( testprintf( buffer, 100, "%#03.6x", UINT_MAX ) == UINT_DIG ); + TESTCASE( testprintf( target, "%#03.6x", UINT_MAX ) == UINT_DIG ); TESTCASE_SPRINTF( "0xf" INT_hexdig ); - TESTCASE( testprintf( buffer, 100, "%#0.6d", INT_MAX ) == INT_DIG ); + TESTCASE( testprintf( target, "%#0.6d", INT_MAX ) == INT_DIG ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%#06.3d", INT_MAX ) == INT_DIG ); + TESTCASE( testprintf( target, "%#06.3d", INT_MAX ) == INT_DIG ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%#03.6d", INT_MAX ) == INT_DIG ); + TESTCASE( testprintf( target, "%#03.6d", INT_MAX ) == INT_DIG ); TESTCASE_SPRINTF( INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%#+.6d", INT_MAX ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%#+.6d", INT_MAX ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%#+6.3d", INT_MAX ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%#+6.3d", INT_MAX ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%#+3.6d", INT_MAX ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%#+3.6d", INT_MAX ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%+0.6d", INT_MAX ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%+0.6d", INT_MAX ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%+06.3d", INT_MAX ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%+06.3d", INT_MAX ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "%+03.6d", INT_MAX ) == INT_DIG + 1 ); + TESTCASE( testprintf( target, "%+03.6d", INT_MAX ) == INT_DIG + 1 ); TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR ); #ifndef TEST_CONVERSION_ONLY - TESTCASE( testprintf( buffer, 100, "- %d", INT_MAX ) == INT_DIG + 2 ); + TESTCASE( testprintf( target, "- %d", INT_MAX ) == INT_DIG + 2 ); TESTCASE_SPRINTF( "- " INT_MAX_DEZ_STR ); - TESTCASE( testprintf( buffer, 100, "- %d %% %d", INT_MAX, INT_MIN ) == INT_DIG * 2 + 6 ); + TESTCASE( testprintf( target, "- %d %% %d", INT_MAX, INT_MIN ) == INT_DIG * 2 + 6 ); TESTCASE_SPRINTF( "- " INT_MAX_DEZ_STR " % -" INT_MIN_DEZ_STR ); #endif - TESTCASE( testprintf( buffer, 100, "%c", 'x' ) == 1 ); + TESTCASE( testprintf( target, "%c", 'x' ) == 1 ); TESTCASE_SPRINTF( "x" ); - TESTCASE( testprintf( buffer, 100, "%s", "abcdef" ) == 6 ); + TESTCASE( testprintf( target, "%s", "abcdef" ) == 6 ); TESTCASE_SPRINTF( "abcdef" ); /* FIXME: This test not yet 32/64 bit agnostic */ - TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 ); + TESTCASE( testprintf( target, "%p", (void *)0xdeadbeef ) == 10 ); TESTCASE_SPRINTF( "0xdeadbeef" ); - TESTCASE( testprintf( buffer, 100, "%#6x", 1 ) == 6 ); + TESTCASE( testprintf( target, "%#6x", 1 ) == 6 ); TESTCASE_SPRINTF( "0x0001" ); #ifndef TEST_CONVERSION_ONLY { int val1, val2; - TESTCASE( testprintf( buffer, 100, "123456%n789%n", &val1, &val2 ) == 9 ); + TESTCASE( testprintf( target, "123456%n789%n", &val1, &val2 ) == 9 ); TESTCASE_SPRINTF( "123456789" ); /* FIXME */ TESTCASE( val1 == 6 ); TESTCASE( val2 == 9 ); -- 2.40.0