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

Merge pull request #205 from sitsofe/exit1_on_fail

Browse Source 
Tests: Exit iscsi-test-cu with 1 if a test fails
This commit is contained in:
Ronnie Sahlberg
2016-05-06 06:22:31 -07:00
parent 2b9cd64e7c f291c7f9c0
commit 62a81b6a53
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test-tool/iscsi-test-cu.c
+9 -1
View File
@@ -1094,6 +1094,8 @@ main(int argc, char *argv[])
}; };
int i, c; int i, c;
int opt_idx = 0; int opt_idx = 0;
unsigned int failures = 0;
int ret;
while ((c = getopt_long(argc, argv, "?hli:I:t:sdgfAsSnvxV", long_opts, while ((c = getopt_long(argc, argv, "?hli:I:t:sdgfAsSnvxV", long_opts,
&opt_idx)) > 0) { &opt_idx)) > 0) {
@@ -1445,6 +1447,7 @@ main(int argc, char *argv[])
printf("Tests completed with return value: %d\n", res); printf("Tests completed with return value: %d\n", res);
} }
failures = CU_get_number_of_failures();
CU_cleanup_registry(); CU_cleanup_registry();
if (inq_task != NULL) { if (inq_task != NULL) {
@@ -1469,7 +1472,12 @@ main(int argc, char *argv[])
free_scsi_device(mp_sds[i]); free_scsi_device(mp_sds[i]);
} }
free(scratch); free(scratch);
return 0; if (failures > 0) {
ret = 1;
} else {
ret = 0;
}
return ret;
err_sds_free: err_sds_free:
for (i = 0; i < mp_num_sds; i++) { for (i = 0; i < mp_num_sds; i++) {