diff --git a/test_conformance/printf/util_printf.cpp b/test_conformance/printf/util_printf.cpp index 6e44b43fd8..0686931e3d 100644 --- a/test_conformance/printf/util_printf.cpp +++ b/test_conformance/printf/util_printf.cpp @@ -935,7 +935,42 @@ std::vector printVectorGenParameters = { //(Minimum)Two-wide,two positions after decimal - { { "" }, "(1.0h,2.0h,3.0h,4.0h)", "%2.2", "hf", "half", "4" } + { { "" }, "(1.0h,2.0h,3.0h,4.0h)", "%2.2", "hf", "half", "4" }, + + // Three component vector in scientific notation + + { { "" }, "(1234.25f,987654.5f,0.0005f)", "%.2", "e", "float", "3" }, + + // Four component vector in hexadecimal floating point, lowercase format + + { { "" }, "(0.25f,0.5f,1.f,1.5f)", "%", "a", "float", "4" }, + + // Eight component vector in the shortest float representation + + { { "" }, + "(1.f,2.f,3.f,4.f,1.5f,3.14f,2.5f,3.5f)", + "%", + "g", + "float", + "8" }, + + // Sixteen component vector in unsigned octal format + + { { "" }, + "(1,2,3,4,5,6,7,8,9,0,32,64,128,256,512,1024)", + "%", + "o", + "uint", + "16" }, + + // Eight component vector in signed decimal integer format + + { { "" }, "(1,-2,3,-4,5,-6,7,-8)", "%+", "i", "int", "8" }, + + // Four component vector in unsigned decimal integer format + + { { "" }, "(512,1024,262144,1048576)", "%05", "u", "uint", "4" }, + }; //------------------------------------------------------------ @@ -956,8 +991,19 @@ std::vector correctBufferVector = { "12345678,98765432", - "1.00,2.00,3.00,4.00" + "1.00,2.00,3.00,4.00", + + "1.23e+03,9.88e+05,5.00e-04", + + "0x1p-2,0x1p-1,0x1p+0,0x1.8p+0", + + "1,2,3,4,1.5,3.14,2.5,3.5", + + "1,2,3,4,5,6,7,10,11,0,40,100,200,400,1000,2000", + + "+1,-2,+3,-4,+5,-6,+7,-8", + "00512,01024,262144,1048576" }; //-----------------------------------------------------------