]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Mark which tests have skips
authorTim Kientzle <kientzle@acm.org>
Sun, 22 Jun 2014 17:42:23 +0000 (10:42 -0700)
committerTim Kientzle <kientzle@acm.org>
Sun, 22 Jun 2014 17:42:23 +0000 (10:42 -0700)
libarchive/test/main.c

index f61d16c4cb3d7b51783180f025d82cb59e794b12..fcb0f6901c0eebdb0779b4fa0860966d43016c90 100644 (file)
@@ -2289,7 +2289,7 @@ struct test_list_t tests[] = {
  * Summarize repeated failures in the just-completed test.
  */
 static void
-test_summarize(int failed)
+test_summarize(int failed, int skips)
 {
        unsigned int i;
 
@@ -2299,7 +2299,7 @@ test_summarize(int failed)
                fflush(stdout);
                break;
        case VERBOSITY_PASSFAIL:
-               printf(failed ? "FAIL\n" : "ok\n");
+               printf(failed ? "FAIL\n" : skips ? "ok (S)\n" : "ok\n");
                break;
        }
 
@@ -2324,6 +2324,7 @@ test_run(int i, const char *tmpdir)
        char workdir[1024];
        char logfilename[64];
        int failures_before = failures;
+       int skips_before = skips;
        int oldumask;
 
        switch (verbosity) {
@@ -2380,7 +2381,7 @@ test_run(int i, const char *tmpdir)
        }
        /* Report per-test summaries. */
        tests[i].failures = failures - failures_before;
-       test_summarize(tests[i].failures);
+       test_summarize(tests[i].failures, skips - skips_before);
        /* Close the per-test log file. */
        fclose(logfile);
        logfile = NULL;