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

Make task->residual a size_t instead of an int

Browse Source 
Update and improve the log messages for failures for the read10 invalid test
This commit is contained in:
Ronnie Sahlberg
2013-03-23 11:23:02 -07:00
parent 2d10d0a2d8
commit 808eed9680
8 changed files with 88 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test-tool/0122_read6_invalid.c
View File

@@ -95,7 +95,7 @@ int T0122_read6_invalid(const char *initiator, const char *url)
goto finished;
}
if (task->residual_status != SCSI_RESIDUAL_OVERFLOW ||
task->residual != (ssize_t)block_size) {
task->residual != block_size) {
printf("[FAILED]\n");
printf("Read6 returned incorrect residual overflow.\n");
ret = -1;
@@ -141,7 +141,7 @@ int T0122_read6_invalid(const char *initiator, const char *url)
goto finished;
}
if (task->residual_status != SCSI_RESIDUAL_UNDERFLOW ||
task->residual != (ssize_t)block_size) {
task->residual != block_size) {
printf("[FAILED]\n");
printf("Read6 returned incorrect residual underflow.\n");
ret = -1;
@@ -184,7 +184,7 @@ int T0122_read6_invalid(const char *initiator, const char *url)
goto finished;
}
if (task->residual_status != SCSI_RESIDUAL_OVERFLOW ||
task->residual != (ssize_t)block_size - 200) {
task->residual != block_size - 200) {
printf("[FAILED]\n");
printf("Read6 returned incorrect residual overflow.\n");
ret = -1;
@@ -196,7 +196,7 @@ int T0122_read6_invalid(const char *initiator, const char *url)
/* Try a read of 2 blocks but xferlength == block_size */
printf("Read6 2 blocks but with iscsi ExpectedDataTransferLength==%d ... ", block_size);
printf("Read6 2 blocks but with iscsi ExpectedDataTransferLength==%zu ... ", block_size);
task = malloc(sizeof(struct scsi_task));
if (task == NULL) {
@@ -221,13 +221,13 @@ int T0122_read6_invalid(const char *initiator, const char *url)
}
if (task->status != SCSI_STATUS_GOOD) {
printf("[FAILED]\n");
printf("Read6 of 2 blocks with iscsi ExpectedDataTransferLength==%d should succeed.\n", block_size);
printf("Read6 of 2 blocks with iscsi ExpectedDataTransferLength==%zu should succeed.\n", block_size);
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
if (task->residual_status != SCSI_RESIDUAL_OVERFLOW ||
task->residual != (ssize_t)block_size) {
task->residual != block_size) {
printf("[FAILED]\n");
printf("Read6 returned incorrect residual overflow.\n");
ret = -1;