From: Tim Kientzle <kientzle@acm.org>
Date: Sun, 22 Jun 2014 17:42:23 +0000 (-0700)
Subject: Mark which tests have skips
X-Git-Tag: v3.1.900a~282
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ecd36c3b1e9ffe1823e8b0eccd8d6924ccf272;p=thirdparty%2Flibarchive.git

Mark which tests have skips
---

diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index f61d16c4c..fcb0f6901 100644
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -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;