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

test-tool: fix initiatorname and initiatorname2 issues

Browse Source 
gcc-4.6.3 warned about this one on several occasions:
  gcc -DHAVE_CONFIG_H -I.  -I. -I./include "-D_U_=__attribute__((unused))" -I./test-tool  -Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -ggdb3 -O0 -MT test-tool/bin_iscsi_test-0000_testunitready_simple.o -MD -MP -MF test-tool/.deps/bin_iscsi_test-0000_testunitready_simple.Tpo -c -o test-tool/bin_iscsi_test-0000_testunitready_simple.o `test -f 'test-tool/0000_testunitready_simple.c' || echo './'`test-tool/0000_testunitready_simple.c
  test-tool/0000_testunitready_simple.c: In function 'T0000_testunitready_simple':
  test-tool/0000_testunitready_simple.c:23:44: warning: declaration of 'initiator' shadows a global declaration [-Wshadow]
  test-tool/iscsi-test.h:20:20: warning: shadowed declaration is here [-Wshadow]

For now the global initiator is renamed to initiatorname1 (and initiator2 is
renamed to initiatorname2, respectively), but ultimately the globals should
probably go away.

While fixing this it also became apparent that initiator-name-2 was parsed
into the "initiator" variable as well.

Signed-off-by: Arne Redlich <arne.redlich@googlemail.com>
This commit is contained in:
Arne Redlich
2012-10-31 15:32:18 +01:00
parent 3af45f5867
commit 4d27ecae32
7 changed files with 91 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test-tool/0420_reserve6_simple.c
View File

@@ -51,7 +51,7 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss,
return -1; return -1;
} }
iscsi2 = iscsi_context_login(initiator2, url, &lun); iscsi2 = iscsi_context_login(initiatorname2, url, &lun);
if (iscsi2 == NULL) { if (iscsi2 == NULL) {
printf("Failed to login to target\n"); printf("Failed to login to target\n");
ret = 1; ret = 1;

2
test-tool/0421_reserve6_lun_reset.c
View File

@@ -65,7 +65,7 @@ int T0421_reserve6_lun_reset(const char *initiator, const char *url, int data_lo
return -1; return -1;
} }
iscsi2 = iscsi_context_login(initiator2, url, &lun); iscsi2 = iscsi_context_login(initiatorname2, url, &lun);
if (iscsi2 == NULL) { if (iscsi2 == NULL) {
printf("Failed to login to target\n"); printf("Failed to login to target\n");
return -1; return -1;

2
test-tool/0422_reserve6_logout.c
View File

@@ -48,7 +48,7 @@ int T0422_reserve6_logout(const char *initiator, const char *url, int data_loss,
return -1; return -1;
} }
iscsi2 = iscsi_context_login(initiator2, url, &lun); iscsi2 = iscsi_context_login(initiatorname2, url, &lun);
if (iscsi2 == NULL) { if (iscsi2 == NULL) {
printf("Failed to login to target\n"); printf("Failed to login to target\n");
return -1; return -1;

2
test-tool/0423_reserve6_sessionloss.c
View File

@@ -48,7 +48,7 @@ int T0423_reserve6_sessionloss(const char *initiator, const char *url, int data_
return -1; return -1;
} }
iscsi2 = iscsi_context_login(initiator2, url, &lun); iscsi2 = iscsi_context_login(initiatorname2, url, &lun);
if (iscsi2 == NULL) { if (iscsi2 == NULL) {
printf("Failed to login to target\n"); printf("Failed to login to target\n");
return -1; return -1;

2
test-tool/0424_reserve6_target_reset.c
View File

@@ -65,7 +65,7 @@ int T0424_reserve6_target_reset(const char *initiator, const char *url, int data
return -1; return -1;
} }
iscsi2 = iscsi_context_login(initiator2, url, &lun); iscsi2 = iscsi_context_login(initiatorname2, url, &lun);
if (iscsi2 == NULL) { if (iscsi2 == NULL) {
printf("Failed to login to target\n"); printf("Failed to login to target\n");
return -1; return -1;

15
test-tool/iscsi-test.c
View File

@@ -34,8 +34,8 @@
#include "iscsi-private.h" #include "iscsi-private.h"
#include "iscsi-test.h" #include "iscsi-test.h"
const char *initiator = "iqn.2007-10.com.github:sahlberg:libiscsi:iscsi-test"; const char *initiatorname1 = "iqn.2007-10.com.github:sahlberg:libiscsi:iscsi-test";
const char *initiator2 = "iqn.2007-10.com.github:sahlberg:libiscsi:iscsi-test-2"; const char *initiatorname2 = "iqn.2007-10.com.github:sahlberg:libiscsi:iscsi-test-2";
static int data_loss = 0; static int data_loss = 0;
static int show_info = 0; static int show_info = 0;
@@ -387,8 +387,8 @@ int main(int argc, const char *argv[])
{ "help", '?', POPT_ARG_NONE, &show_help, 0, "Show this help message", NULL }, { "help", '?', POPT_ARG_NONE, &show_help, 0, "Show this help message", NULL },
{ "usage", 0, POPT_ARG_NONE, &show_usage, 0, "Display brief usage message", NULL }, { "usage", 0, POPT_ARG_NONE, &show_usage, 0, "Display brief usage message", NULL },
{ "list", 'l', POPT_ARG_NONE, &list_tests, 0, "List all tests", NULL }, { "list", 'l', POPT_ARG_NONE, &list_tests, 0, "List all tests", NULL },
{ "initiator-name", 'i', POPT_ARG_STRING, &initiator, 0, "Initiatorname to use", "iqn-name" }, { "initiator-name", 'i', POPT_ARG_STRING, &initiatorname1, 0, "Initiatorname to use", "iqn-name" },
{ "initiator-name-2", 'I', POPT_ARG_STRING, &initiator, 0, "Second initiatorname to use for tests using more two sessions", "iqn-name" }, { "initiator-name-2", 'I', POPT_ARG_STRING, &initiatorname2, 0, "Second initiatorname to use for tests using more than one session", "iqn-name" },
{ "test", 't', POPT_ARG_STRING, &testname, 0, "Which test to run", "testname" }, { "test", 't', POPT_ARG_STRING, &testname, 0, "Which test to run", "testname" },
{ "skip", 's', POPT_ARG_STRING, &skipname, 0, "Which test to skip", "skipname" }, { "skip", 's', POPT_ARG_STRING, &skipname, 0, "Which test to skip", "skipname" },
{ "info", 0, POPT_ARG_NONE, &show_info, 0, "Show information about the test", "testname" }, { "info", 0, POPT_ARG_NONE, &show_info, 0, "Show information about the test", "testname" },
@@ -427,7 +427,7 @@ int main(int argc, const char *argv[])
for (test = &tests[0]; test->name; test++) { for (test = &tests[0]; test->name; test++) {
printf("%s\n", test->name); printf("%s\n", test->name);
if (show_info) { if (show_info) {
test->test(initiator, url, data_loss, show_info); test->test(initiatorname1, url, data_loss, show_info);
} }
} }
exit(0); exit(0);
@@ -438,7 +438,7 @@ int main(int argc, const char *argv[])
fprintf(stderr, "You must specify the URL\n"); fprintf(stderr, "You must specify the URL\n");
print_usage(); print_usage();
free(skipname); free(skipname);
free(testname); free(testname);
exit(10); exit(10);
} }
@@ -463,7 +463,7 @@ int main(int argc, const char *argv[])
if (skip) continue; if (skip) continue;
} }
res = test->test(initiator, url, data_loss, show_info); res = test->test(initiatorname1, 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) { } else if (res == -2) {
@@ -482,4 +482,3 @@ int main(int argc, const char *argv[])
return num_failed ? num_failed : num_skipped ? 77 : 0; return num_failed ? num_failed : num_skipped ? 77 : 0;
} }

5
test-tool/iscsi-test.h
View File

@@ -17,8 +17,8 @@
along with this program; if not, see <http://www.gnu.org/licenses/>. along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
extern const char *initiator; extern const char *initiatorname1;
extern const char *initiator2; extern const char *initiatorname2;
struct iscsi_context *iscsi_context_login(const char *initiatorname, const char *url, int *lun); struct iscsi_context *iscsi_context_login(const char *initiatorname, const char *url, int *lun);
@@ -182,4 +182,3 @@ int T1010_datasn_invalid(const char *initiator, const char *url, int data_loss,
int T1020_bufferoffset_invalid(const char *initiator, const char *url, int data_loss, int show_info); int T1020_bufferoffset_invalid(const char *initiator, const char *url, int data_loss, int show_info);
int T1030_unsolicited_data_overflow(const char *initiator, const char *url, int data_loss, int show_info); int T1030_unsolicited_data_overflow(const char *initiator, const char *url, int data_loss, int show_info);
int T1031_unsolicited_data_out(const char *initiator, const char *url, int data_loss, int show_info); int T1031_unsolicited_data_out(const char *initiator, const char *url, int data_loss, int show_info);