Test commit

Signed-off-by: Bence Szépkúti <[email protected]>

Author: bensze01

tests/suites/test_suite_debug.function

@@ -105,17 +105,42 @@ void printf_int_expr(intmax_t smuggle_format_expr, /* TODO: teach test framework
 
     /* Nominal case: buffer just large enough */
     TEST_CALLOC(output, n + 1);
+
+    int retval;
     if ((size_t) sizeof_x <= sizeof(int)) { // Any smaller integers would be promoted to an int due to calling a vararg function
-        TEST_EQUAL(n, mbedtls_snprintf(output, n + 1, format, (int) x));
+        retval = mbedtls_snprintf(output, n + 1, format, (int) x);
     } else if (sizeof_x == sizeof(long)) {
-        TEST_EQUAL(n, mbedtls_snprintf(output, n + 1, format, (long) x));
+        retval = mbedtls_snprintf(output, n + 1, format, (long) x);
     } else if (sizeof_x == sizeof(long long)) {
-        TEST_EQUAL(n, mbedtls_snprintf(output, n + 1, format, (long long) x));
+        retval = mbedtls_snprintf(output, n + 1, format, (long long) x);
     } else {
         TEST_FAIL(
             "sizeof_x <= sizeof(int) || sizeof_x == sizeof(long) || sizeof_x == sizeof(long long)");
     }
-    TEST_MEMORY_COMPARE(result, n + 1, output, n + 1);
+
+    if (retval != (int) n || memcmp(output, result, n) != 0) {
+        char test[MBEDTLS_TEST_LINE_LENGTH * 3];
+        int written = mbedtls_snprintf(
+            test, sizeof(test) - 1,
+            "mbedtls_snprintf(buf, %lld, \"%s\", %lld) == %lld && strcmp(buf, \"%s\")\nmbedtls_snprint(...) = %d",
+            (long long) n + 1, format, (long long) x, (long long) n, result, retval);
+        if (retval >= 0) {
+            written += mbedtls_snprintf(test + written, sizeof(test) - written - 1, "\nbuf = \"");
+            if (retval <= (int) n) {
+                written += mbedtls_snprintf(test + written, sizeof(test) - written - 1, "%s", output);
+            } else {
+                if ((size_t) sizeof_x <= sizeof(int)) {
+                    written += mbedtls_snprintf(test + written, sizeof(test) - written - 1, format, (int)x);
+                } else if (sizeof_x == sizeof(long)) {
+                    written += mbedtls_snprintf(test + written, sizeof(test) - written - 1, format, (long)x);
+                } else if (sizeof_x == sizeof(long long)) {
+                    written += mbedtls_snprintf(test + written, sizeof(test) - written - 1, format, (long long)x);
+                }
+            }
+            written += mbedtls_snprintf(test + written, sizeof(test) - written - 1, "\"");
+        }
+        TEST_FAIL(test);
+    }
 
 exit:
     mbedtls_free(output);