X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fgeneral%2Fsnprintf.c;h=fefe814bbfddbe3bd2b4d0ca36b54cf2905ddae8;hb=f10a03ad1613d53338c9781e595c666aea57f50a;hp=1187fd7a50a30815b8126593919d835ba344185d;hpb=5729b0cb56800bde195ac79324f23af6a54bdaac;p=libc-test

diff --git a/src/general/snprintf.c b/src/general/snprintf.c
index 1187fd7..fefe814 100644
--- a/src/general/snprintf.c
+++ b/src/general/snprintf.c
@@ -160,13 +160,23 @@ int main(void)
 	TEST(i, errno, EOVERFLOW, "after overflow: %d != %d");
 #endif
 	for (j=0; int_tests[j].fmt; j++) {
-		TEST(i, snprintf(b, sizeof b, int_tests[j].fmt, int_tests[j].i), strlen(b), "%d != %d");
-		TEST_S(b, int_tests[j].expect, "bad integer conversion");
+		i = snprintf(b, sizeof b, int_tests[j].fmt, int_tests[j].i);
+		if (i != strlen(int_tests[j].expect)) {
+			error("snprintf(b, sizeof b, \"%s\", %d) returned %d wanted %d\n",
+				int_tests[j].fmt, int_tests[j].i, i, strlen(int_tests[j].expect));
+		}
+		if (strcmp(b, int_tests[j].expect) != 0)
+			error("bad integer conversion: got \"%s\", want \"%s\"\n", b, int_tests[j].expect);
 	}
 
 	for (j=0; fp_tests[j].fmt; j++) {
-		TEST(i, snprintf(b, sizeof b, fp_tests[j].fmt, fp_tests[j].f), strlen(b), "%d != %d");
-		TEST_S(b, fp_tests[j].expect, "bad floating point conversion");
+		i = snprintf(b, sizeof b, fp_tests[j].fmt, fp_tests[j].f);
+		if (i != strlen(fp_tests[j].expect)) {
+			error("snprintf(b, sizeof b, \"%s\", %f) returned %d wanted %d\n",
+				fp_tests[j].fmt, fp_tests[j].f, i, strlen(fp_tests[j].expect));
+		}
+		if (strcmp(b, fp_tests[j].expect) != 0)
+			error("bad floating-point conversion: got \"%s\", want \"%s\"\n", b, fp_tests[j].expect);
 	}
 
 	TEST(i, snprintf(0, 0, "%.4a", 1.0), 11, "%d != %d");