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

36
test-tool/0420_reserve6_simple.c
View File

@@ -1,16 +1,16 @@
/*
/*
Copyright (C) 2012 by Jon Grimm <jon.grimm@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
@@ -23,7 +23,7 @@
#include "iscsi-test.h"
int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss, int show_info)
{
{
struct iscsi_context *iscsi, *iscsi2;
struct scsi_task *task;
int ret, lun;
@@ -40,7 +40,7 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss,
printf("4. Test Initiator 1 can testunitready if reserved by Initiator 1.\n");
printf("5. Test Initiator 2 can't testunitready if reserved by Initiator 1.\n");
printf("6. Test Initiator 2 can get reservation once Intiator 1 releases reservation.\n");
printf("\n");
return 0;
}
@@ -51,9 +51,9 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss,
return -1;
}
iscsi2 = iscsi_context_login(initiator2, url, &lun);
iscsi2 = iscsi_context_login(initiatorname2, url, &lun);
if (iscsi2 == NULL) {
printf("Failed to login to target\n");
printf("Failed to login to target\n");
ret = 1;
goto out_login1;
}
@@ -71,8 +71,8 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss,
}
if (task->status != SCSI_STATUS_GOOD) {
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
printf("[OK]\n");
printf("RESERVE6 Not Supported\n");
goto finished2;
@@ -80,7 +80,7 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss,
printf("[FAILED]\n");
printf("RESERVE6 failed but ascq was wrong. Should "
"have failed with ILLEGAL_REQUEST/"
"INVALID OPERATOR. Sense:%s\n",
"INVALID OPERATOR. Sense:%s\n",
iscsi_get_error(iscsi));
ret = -1;
goto finished2;
@@ -93,14 +93,14 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss,
task = iscsi_release6_sync(iscsi, lun);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send RELEASE6 command : %s\n",
printf("Failed to send RELEASE6 command : %s\n",
iscsi_get_error(iscsi));
ret = -1;
goto finished1;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("[FAILED]\n");
printf("RELEASE6 command failed : %s\n",
printf("RELEASE6 command failed : %s\n",
iscsi_get_error(iscsi));
ret = -1;
goto finished2;
@@ -157,7 +157,7 @@ test3:
iscsi_get_error(iscsi));
ret = -1;
goto finished1;
}
}
/* We expect this command to fail for the test to pass. */
if (task->status != SCSI_STATUS_RESERVATION_CONFLICT) {
printf("[FAILED]\n");
@@ -196,7 +196,7 @@ test4:
task = iscsi_testunitready_sync(iscsi, lun);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send TEST UNIT READY command: %s\n",
printf("Failed to send TEST UNIT READY command: %s\n",
iscsi_get_error(iscsi));
ret = -1;
goto finished1;
@@ -216,7 +216,7 @@ test5:
task = iscsi_testunitready_sync(iscsi2, lun);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send TEST UNIT READY command: %s\n",
printf("Failed to send TEST UNIT READY command: %s\n",
iscsi_get_error(iscsi2));
ret = -1;
goto finished1;
@@ -236,14 +236,14 @@ test6:
task = iscsi_release6_sync(iscsi, lun);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send RELEASE6 command : %s\n",
printf("Failed to send RELEASE6 command : %s\n",
iscsi_get_error(iscsi));
ret = -1;
goto finished1;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("[FAILED]\n");
printf("RELEASE6 command failed : %s\n",
printf("RELEASE6 command failed : %s\n",
iscsi_get_error(iscsi));
ret = -1;
goto finished2;