summaryrefslogtreecommitdiff
path: root/cpio
diff options
context:
space:
mode:
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>2014-06-29 14:28:04 +0900
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>2014-06-29 14:28:04 +0900
commit46b07678db2e279cdd06304171ffe1036916ec67 (patch)
tree00f2b06d7c8a2c1070005a402010784b7da0d07f /cpio
parent7679625dbeb6b9bac6e5080d3903364b33da87fa (diff)
downloadlibarchive-46b07678db2e279cdd06304171ffe1036916ec67.tar.gz
Apply recent changs in libarvhie/test/main.c to {tar,cpio,cat}/test/main.c for keeping maintenacebility.
Diffstat (limited to 'cpio')
-rw-r--r--cpio/test/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/cpio/test/main.c b/cpio/test/main.c
index f8366163..92f21633 100644
--- a/cpio/test/main.c
+++ b/cpio/test/main.c
@@ -2253,7 +2253,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_num)
{
unsigned int i;
@@ -2263,7 +2263,7 @@ test_summarize(int failed)
fflush(stdout);
break;
case VERBOSITY_PASSFAIL:
- printf(failed ? "FAIL\n" : "ok\n");
+ printf(failed ? "FAIL\n" : skips_num ? "ok (S)\n" : "ok\n");
break;
}
@@ -2288,6 +2288,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) {
@@ -2344,7 +2345,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;