Some cleanups and corrected typos.

diff --git a/functions/stdio/fprintf.c b/functions/stdio/fprintf.c
index b7bd43a19ec7e8c748b9dc9b4f11ab4439ceb99b..38fb9b81fdae0dcd819820006c9caf7cac7902fe 100644 (file)
--- a/functions/stdio/fprintf.c
+++ b/functions/stdio/fprintf.c
@@ -39,7 +39,6 @@ int main( void )
     TESTCASE( ( target = fopen( "testing/testfile", "wb+" ) ) != NULL );
 #include "printf_testcases.incl"
     TESTCASE( fclose( target ) == 0 );
     TESTCASE( ( target = fopen( "testing/testfile", "wb+" ) ) != NULL );
 #include "printf_testcases.incl"
     TESTCASE( fclose( target ) == 0 );

-#include "fprintf_reftest.incl"

     TESTCASE( remove( "testing/testfile" ) == 0 );
     return TEST_RESULTS;
 }
     TESTCASE( remove( "testing/testfile" ) == 0 );
     return TEST_RESULTS;
 }

diff --git a/functions/stdio/printf.c b/functions/stdio/printf.c
index 346dfcc575e6599aa383b09f2d7a967dff2fc064..aa772ec140d6d8b6647ba52c8346d7e37e45cc2c 100644 (file)
--- a/functions/stdio/printf.c
+++ b/functions/stdio/printf.c
@@ -38,7 +38,6 @@ int main( void )
     TESTCASE( ( target = freopen( testfile, "wb+", stdout ) ) != NULL );
 #include "printf_testcases.incl"
     TESTCASE( fclose( target ) == 0 );
     TESTCASE( ( target = freopen( testfile, "wb+", stdout ) ) != NULL );
 #include "printf_testcases.incl"
     TESTCASE( fclose( target ) == 0 );

-#include "fprintf_reftest.incl"

     TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }
     TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }

diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c
index b5dacb465144555f63330eef9c6b83ea9af8b7ee..7ab3167499a8d2f57360d01a1b3a458abf4b477d 100644 (file)
--- a/functions/stdio/vfprintf.c
+++ b/functions/stdio/vfprintf.c
@@ -72,7 +72,6 @@ int main( void )
     TESTCASE( ( target = fopen( testfile, "wb+" ) ) != NULL );
 #include "printf_testcases.incl"
     TESTCASE( fclose( target ) == 0 );
     TESTCASE( ( target = fopen( testfile, "wb+" ) ) != NULL );
 #include "printf_testcases.incl"
     TESTCASE( fclose( target ) == 0 );

-#include "fprintf_reftest.incl"

     TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }
     TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }

diff --git a/functions/stdio/vprintf.c b/functions/stdio/vprintf.c
index 55c37e4dfab8c49950a0c99a45f09c96d6a8a180..4cb5af39afeaa89e0da5460065bd67849178c864 100644 (file)
--- a/functions/stdio/vprintf.c
+++ b/functions/stdio/vprintf.c
@@ -41,7 +41,6 @@ int main( void )
     TESTCASE( ( target = freopen( testfile, "wb+", stdout ) ) != NULL );
 #include "printf_testcases.incl"
     TESTCASE( fclose( target ) == 0 );
     TESTCASE( ( target = freopen( testfile, "wb+", stdout ) ) != NULL );
 #include "printf_testcases.incl"
     TESTCASE( fclose( target ) == 0 );

-#include "fprintf_reftest.incl"

     TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }
     TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }

diff --git a/platform/example/testing/printf_reference.txt b/platform/example/testing/printf_reference.txt
deleted file mode 100644 (file)
index 6ba350a..0000000
--- a/platform/example/testing/printf_reference.txt
+++ /dev/null
@@ -1 +0,0 @@
--1281270-32768327670-214748364821474836470-214748364821474836470-922337203685477580892233720368547758070255255655356553542949672954294967295429496729542949672951844674407370955161518446744073709551615FFFFFFFF0XFFFFFFFFffffffff0xffffffff37777777777037777777777-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 % -2147483648xabcdef0xdeadbeef   0x1123456789
\ No newline at end of file

diff --git a/platform/example_64/testing/printf_reference.txt b/platform/example_64/testing/printf_reference.txt
deleted file mode 100644 (file)
index c3e1d86..0000000
--- a/platform/example_64/testing/printf_reference.txt
+++ /dev/null
@@ -1 +0,0 @@
--1281270-32768327670-214748364821474836470-922337203685477580892233720368547758070-92233720368547758089223372036854775807025525565535655354294967295429496729518446744073709551615184467440737095516151844674407370955161518446744073709551615FFFFFFFF0XFFFFFFFFffffffff0xffffffff37777777777037777777777%.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

diff --git a/testing/fprintf_reftest.incl b/testing/fprintf_reftest.incl
deleted file mode 100644 (file)
index 3c6ae4b..0000000
--- a/testing/fprintf_reftest.incl
+++ /dev/null
@@ -1,12 +0,0 @@
-    {
-    char readbuffer[2000];
-    char refbuffer[2000];
-    size_t readcounter;
-    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 f6a44dc369cbfe25535607c09b3400bcfd7ff9d5..2514540c5061dd838066ae8c3e1afea486996fe4 100644 (file)
--- a/testing/printf_testcases.incl
+++ b/testing/printf_testcases.incl
@@ -203,7 +203,7 @@
     PRINTF_TEST( INT_DIG + 1, "-" INT_MIN_DEZ_STR, "%-" INT_DIG_LESS1 "d", INT_MIN );
     PRINTF_TEST( INT_DIG, INT_MAX_DEZ_STR, "%-" INT_DIG_LESS1 "d", INT_MAX );
     PRINTF_TEST( INT_DIG + 1, "-" INT_MIN_DEZ_STR, "%-" sym2s(INT_DIG) "d", INT_MIN );
     PRINTF_TEST( INT_DIG + 1, "-" INT_MIN_DEZ_STR, "%-" INT_DIG_LESS1 "d", INT_MIN );
     PRINTF_TEST( INT_DIG, INT_MAX_DEZ_STR, "%-" INT_DIG_LESS1 "d", INT_MAX );
     PRINTF_TEST( INT_DIG + 1, "-" INT_MIN_DEZ_STR, "%-" sym2s(INT_DIG) "d", INT_MIN );

-    PRINTF_TEST( INT_DIG, INT_MAX_DEZ_STR, "%-" sym2s(INT_DIG) "d", INT_MIN );
+    PRINTF_TEST( INT_DIG, INT_MAX_DEZ_STR, "%-" sym2s(INT_DIG) "d", INT_MAX );

     PRINTF_TEST( INT_DIG + 1, "-" INT_MIN_DEZ_STR, "%-" INT_DIG_PLUS1 "d", INT_MIN );
     PRINTF_TEST( INT_DIG + 1, INT_MAX_DEZ_STR " ", "%-" INT_DIG_PLUS1 "d", INT_MAX );
     PRINTF_TEST( INT_DIG + 2, "-" INT_MIN_DEZ_STR " ", "%-" INT_DIG_PLUS2 "d", INT_MIN );
     PRINTF_TEST( INT_DIG + 1, "-" INT_MIN_DEZ_STR, "%-" INT_DIG_PLUS1 "d", INT_MIN );
     PRINTF_TEST( INT_DIG + 1, INT_MAX_DEZ_STR " ", "%-" INT_DIG_PLUS1 "d", INT_MAX );
     PRINTF_TEST( INT_DIG + 2, "-" INT_MIN_DEZ_STR " ", "%-" INT_DIG_PLUS2 "d", INT_MIN );


@@ -246,7 +246,7 @@
     PRINTF_TEST( INT_DIG + 1, "+" INT_MAX_DEZ_STR, "%+03.6d", INT_MAX );
 #ifndef TEST_CONVERSION_ONLY
     PRINTF_TEST( INT_DIG + 2, "- " INT_MAX_DEZ_STR, "- %d", INT_MAX );
     PRINTF_TEST( INT_DIG + 1, "+" INT_MAX_DEZ_STR, "%+03.6d", INT_MAX );
 #ifndef TEST_CONVERSION_ONLY
     PRINTF_TEST( INT_DIG + 2, "- " INT_MAX_DEZ_STR, "- %d", INT_MAX );

-    PRINTF_TEST( INT_DIG * 2 + 6, "- " INT_MAX_DEZ_STR, " % -" INT_MIN_DEZ_STR, INT_MIN );
+    PRINTF_TEST( INT_DIG * 2 + 6, "- " INT_MAX_DEZ_STR " % -" INT_MIN_DEZ_STR, "- %d %% %d", INT_MAX, INT_MIN );

 #endif
     PRINTF_TEST( 1, "x", "%c", 'x' );
     PRINTF_TEST( 6, "abcdef", "%s", "abcdef" );
 #endif
     PRINTF_TEST( 1, "x", "%c", 'x' );
     PRINTF_TEST( 6, "abcdef", "%s", "abcdef" );