test: fix tap output even when ok but have output

This commit is contained in:
Timothy J Fontaine 2013-02-27 13:39:10 -08:00 committed by Ben Noordhuis
parent 1821bba408
commit 49d2ae33ef

View File

@ -255,10 +255,17 @@ out:
FATAL("process_wait failed"); FATAL("process_wait failed");
} }
if (tap_output) {
if (status == 0)
LOGF("ok %d - %s\n", test_count, test);
else
LOGF("not ok %d - %s\n", test_count, test);
}
/* Show error and output from processes if the test failed. */ /* Show error and output from processes if the test failed. */
if (status != 0 || task->show_output) { if (status != 0 || task->show_output) {
if (tap_output && status != 0) { if (tap_output) {
LOGF("not ok %d - %s\n#", test_count, test); LOGF("#");
} else if (status != 0) { } else if (status != 0) {
LOGF("\n`%s` failed: %s\n", test, errmsg); LOGF("\n`%s` failed: %s\n", test, errmsg);
} else { } else {
@ -305,8 +312,6 @@ out:
} }
break; break;
} }
} else if (tap_output) {
LOGF("ok %d - %s\n", test_count, test);
} }
/* Clean up all process handles. */ /* Clean up all process handles. */