X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=testing%2Fprintf_testcases.h;h=e0357fc72b30c7243063dc00bb0f84e59a93505f;hb=refs%2Fheads%2Fbranches%2Fdefault;hp=3f0d1dc392d8ea4718b1a6066df9476b6ddab4bc;hpb=9f7ad86a65f59665c426abd75aaec8200a201f9f;p=pdclib

diff --git a/testing/printf_testcases.h b/testing/printf_testcases.h
index 3f0d1dc..e0357fc 100644
--- a/testing/printf_testcases.h
+++ b/testing/printf_testcases.h
@@ -1,5 +1,5 @@
     {
-#if defined(_PDCLIB_CHAR_SIGNED)
+#if CHAR_MIN == -128
     assert(CHAR_MIN == -128);
     PRINTF_TEST( 4,   "-128", "%hhd", CHAR_MIN );
     assert(CHAR_MAX == 127);
@@ -94,7 +94,7 @@
     PRINTF_TEST( (int)strlen( INT_HEXDIG ) + 3, "0xf" INT_hexdig, "%#3.6x", UINT_MAX );
     PRINTF_TEST( INT_DIG + 1, "-" INT_MIN_DEZ_STR, "%.6d", INT_MIN );
     PRINTF_TEST( INT_DIG + 1, "-" INT_MIN_DEZ_STR, "%6.3d", INT_MIN );
-    PRINTF_TEST( INT_DIG + 1., "-" INT_MIN_DEZ_STR, "%3.6d", INT_MIN );
+    PRINTF_TEST( INT_DIG + 1, "-" INT_MIN_DEZ_STR, "%3.6d", INT_MIN );
     PRINTF_TEST( UINT_DIG, "0xf" INT_hexdig, "%#0.6x", UINT_MAX );
     PRINTF_TEST( UINT_DIG, "0xf" INT_hexdig, "%#06.3x", UINT_MAX );
     PRINTF_TEST( UINT_DIG, "0xf" INT_hexdig, "%#03.6x", UINT_MAX );
@@ -125,8 +125,12 @@
     }
 #endif
     }
+    /* PDCLIB-20: Verify "unusual" combinations of length and signedness */
+    PRINTF_TEST( 1,  "1", "%tu", (ptrdiff_t)  1); // unsigned prtdiff_t
+    PRINTF_TEST( 2, "-1", "%jd", (intmax_t)  -1); // intmax_t
+    PRINTF_TEST( 1,  "1", "%ju", (uintmax_t)  1); // uintmax_t
+    PRINTF_TEST( 1,  "1", "%zd", (size_t)     1); // signed size_t
 
-#ifndef TEST_CONVERSION_ONLY
 /******************************************************************************
  * NOTE: The following test cases are imported from the Tyndur project. They  *
  *       are therefore under the license of said project, not CC0.            *
@@ -163,8 +167,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
     {
+#ifndef TEST_CONVERSION_ONLY
     /* Ein String ohne alles */
     PRINTF_TEST(12, "Hallo heimur", "Hallo heimur");
+#endif
     /* Einfache Konvertierungen */
     PRINTF_TEST(12, "Hallo heimur", "%s", "Hallo heimur");
     PRINTF_TEST(4, "1024", "%d", 1024);
@@ -426,5 +432,3 @@
     PRINTF_TEST(20, "00EDCB5433          ", "% -+0*.*X", 20, 10, -0x1234abcdu);
     }
 /******************************************************************************/
-#endif
-    
\ No newline at end of file