warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iscsi-test: prepare to return exit status 77 for skipped tests

Browse Source 
Teach the test harness to distinguish skipped tests from failed tests.
Return -2 from a skipped test and, if no test was failed but some were
skipped, return 77 from the main program.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini
2012-08-30 17:12:35 +02:00
parent f04471d642
commit c7b519524c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test-tool/iscsi-test.c
+7 -4
View File
@@ -331,7 +331,7 @@ int main(int argc, const char *argv[])
int extra_argc = 0; int extra_argc = 0;
const char *url = NULL; const char *url = NULL;
int show_help = 0, show_usage = 0, list_tests = 0; int show_help = 0, show_usage = 0, list_tests = 0;
int res, ret; int res, num_failed, num_skipped;
struct scsi_test *test; struct scsi_test *test;
char *testname = NULL; char *testname = NULL;
@@ -390,7 +390,7 @@ int main(int argc, const char *argv[])
exit(10); exit(10);
} }
ret = 0; num_failed = num_skipped = 0;
for (test = &tests[0]; test->name; test++) { for (test = &tests[0]; test->name; test++) {
if (testname != NULL && fnmatch(testname, test->name, 0)) { if (testname != NULL && fnmatch(testname, test->name, 0)) {
continue; continue;
@@ -399,13 +399,16 @@ int main(int argc, const char *argv[])
res = test->test(initiator, url, data_loss, show_info); res = test->test(initiator, url, data_loss, show_info);
if (res == 0) { if (res == 0) {
printf("TEST %s [OK]\n", test->name); printf("TEST %s [OK]\n", test->name);
} else if (res == -2) {
printf("TEST %s [SKIPPED]\n", test->name);
num_skipped++;
} else { } else {
printf("TEST %s [FAILED]\n", test->name); printf("TEST %s [FAILED]\n", test->name);
ret++; num_failed++;
} }
printf("\n"); printf("\n");
} }
return ret; return num_failed ? num_failed : num_skipped ? 77 : 0;
} }