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

Merge pull request #95 from jh86/master

Browse Source 
Add XML output option to iscsi-test-cu
This commit is contained in:
Ronnie Sahlberg
2014-03-12 05:59:13 -07:00
parent 75769ec286 d34d61a782
commit e216e032af
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test-tool/iscsi-test-cu.c
View File

@@ -31,6 +31,7 @@
#include <CUnit/CUnit.h> #include <CUnit/CUnit.h>
#include <CUnit/Basic.h> #include <CUnit/Basic.h>
#include <CUnit/Automated.h>
#include "iscsi.h" #include "iscsi.h"
#include "scsi-lowlevel.h" #include "scsi-lowlevel.h"
@@ -639,6 +640,8 @@ print_usage(void)
" -n|--normal Test Mode: Normal\n"); " -n|--normal Test Mode: Normal\n");
fprintf(stderr, fprintf(stderr,
" -v|--verbose Test Mode: Verbose [DEFAULT]\n"); " -v|--verbose Test Mode: Verbose [DEFAULT]\n");
fprintf(stderr,
" -x|--xml Test Mode: XML\n");
fprintf(stderr, fprintf(stderr,
" -V|--Verbose-scsi Enable verbose SCSI logging [default SILENT]\n"); " -V|--Verbose-scsi Enable verbose SCSI logging [default SILENT]\n");
fprintf(stderr, "\n"); fprintf(stderr, "\n");
@@ -857,6 +860,7 @@ main(int argc, char *argv[])
struct scsi_task *rsop_task = NULL; struct scsi_task *rsop_task = NULL;
int full_size; int full_size;
int is_usb = 0; int is_usb = 0;
int xml_mode = 0;
static struct option long_opts[] = { static struct option long_opts[] = {
{ "help", no_argument, 0, '?' }, { "help", no_argument, 0, '?' },
{ "list", no_argument, 0, 'l' }, { "list", no_argument, 0, 'l' },
@@ -872,13 +876,14 @@ main(int argc, char *argv[])
{ "normal", no_argument, 0, 'n' }, { "normal", no_argument, 0, 'n' },
{ "usb", no_argument, 0, 'u' }, { "usb", no_argument, 0, 'u' },
{ "verbose", no_argument, 0, 'v' }, { "verbose", no_argument, 0, 'v' },
{ "xml", no_argument, 0, 'x' },
{ "Verbose-scsi", no_argument, 0, 'V' }, { "Verbose-scsi", no_argument, 0, 'V' },
{ NULL, 0, 0, 0 } { NULL, 0, 0, 0 }
}; };
int i, c; int i, c;
int opt_idx = 0; int opt_idx = 0;
while ((c = getopt_long(argc, argv, "?hli:I:t:sdgfAsSnuvV", long_opts, while ((c = getopt_long(argc, argv, "?hli:I:t:sdgfAsSnuvxV", long_opts,
&opt_idx)) > 0) { &opt_idx)) > 0) {
switch (c) { switch (c) {
case 'h': case 'h':
@@ -924,6 +929,9 @@ main(int argc, char *argv[])
case 'v': case 'v':
mode = CU_BRM_VERBOSE; /* default */ mode = CU_BRM_VERBOSE; /* default */
break; break;
case 'x':
xml_mode = 1;
break;
case 'V': case 'V':
loglevel = LOG_VERBOSE; loglevel = LOG_VERBOSE;
break; break;
@@ -1176,9 +1184,14 @@ main(int argc, char *argv[])
/* /*
* this actually runs the tests ... * this actually runs the tests ...
*/ */
res = CU_basic_run_tests();
printf("Tests completed with return value: %d\n", res); if (xml_mode) {
CU_list_tests_to_file();
CU_automated_run_tests();
} else {
res = CU_basic_run_tests();
printf("Tests completed with return value: %d\n", res);
}
CU_cleanup_registry(); CU_cleanup_registry();
if (testname_re) if (testname_re)