From: Richard Levitte <levitte@openssl.org>
Date: Thu, 11 May 2017 17:32:43 +0000 (+0200)
Subject: testutil: Fix non-standard subtest output
X-Git-Tag: OpenSSL_1_1_1-pre1~1521
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0b10da806a3a15b9bfe24ce8d67d3ebac7b7ab06;p=oweals%2Fopenssl.git

testutil: Fix non-standard subtest output

In some cases, testutil outputs subtests like this:

    1..6 # Subtest: progname

The standard set by Test::More (because there really is no actual
standard yet) gives this display:

    # Subtest: progname
    1..6

Until the standard is actually agreed upon, let's do it like
Test::More.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3446)
---

diff --git a/test/testutil/driver.c b/test/testutil/driver.c
index 660db7b327..7be6d2f664 100644
--- a/test/testutil/driver.c
+++ b/test/testutil/driver.c
@@ -134,14 +134,14 @@ int run_tests(const char *test_prog_name)
     char *verdict = NULL;
     int i, j;
 
-    if (num_tests < 1)
+    if (num_tests < 1) {
         test_printf_stdout("%*s1..0 # Skipped: %s\n", level, "",
                            test_prog_name);
-    else if (level > 0)
-        test_printf_stdout("%*s1..%d # Subtest: %s\n", level, "", num_tests,
-                           test_prog_name);
-    else
+    } else {
+        if (level > 0)
+            test_printf_stdout("%*s# Subtest: %s\n", level, "", test_prog_name);
         test_printf_stdout("%*s1..%d\n", level, "", num_tests);
+    }
     test_flush_stdout();
 
     for (i = 0; i != num_tests; ++i) {