diff --git a/test-tool/0130_verify10_simple.c b/test-tool/0130_verify10_simple.c index de7db1d..ea71e64 100644 --- a/test-tool/0130_verify10_simple.c +++ b/test-tool/0130_verify10_simple.c @@ -115,6 +115,7 @@ int T0130_verify10_simple(const char *initiator, const char *url, int data_loss printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); scsi_free_scsi_task(vtask); + ret = -2; goto finished; } if (vtask->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/0131_verify10_mismatch.c b/test-tool/0131_verify10_mismatch.c index cd3b325..231feb3 100644 --- a/test-tool/0131_verify10_mismatch.c +++ b/test-tool/0131_verify10_mismatch.c @@ -118,6 +118,7 @@ int T0131_verify10_mismatch(const char *initiator, const char *url, int data_los printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); scsi_free_scsi_task(vtask); + ret = -2; goto finished; } if (vtask->status == SCSI_STATUS_GOOD) { diff --git a/test-tool/0132_verify10_mismatch_no_cmp.c b/test-tool/0132_verify10_mismatch_no_cmp.c index 78873f0..e96e2a6 100644 --- a/test-tool/0132_verify10_mismatch_no_cmp.c +++ b/test-tool/0132_verify10_mismatch_no_cmp.c @@ -121,6 +121,7 @@ int T0132_verify10_mismatch_no_cmp(const char *initiator, const char *url, int d printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); scsi_free_scsi_task(vtask); + ret = -2; goto finished; } if (vtask->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/0133_verify10_beyondeol.c b/test-tool/0133_verify10_beyondeol.c index f47295e..f981126 100644 --- a/test-tool/0133_verify10_beyondeol.c +++ b/test-tool/0133_verify10_beyondeol.c @@ -96,6 +96,7 @@ int T0133_verify10_beyondeol(const char *initiator, const char *url, int data_lo printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (task->status != SCSI_STATUS_CHECK_CONDITION diff --git a/test-tool/0180_writesame10_unmap.c b/test-tool/0180_writesame10_unmap.c index 08af9e9..6385f27 100644 --- a/test-tool/0180_writesame10_unmap.c +++ b/test-tool/0180_writesame10_unmap.c @@ -172,6 +172,7 @@ test2: printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (lbpws10) { diff --git a/test-tool/0181_writesame10_unmap_unaligned.c b/test-tool/0181_writesame10_unmap_unaligned.c index e9385c5..61559ce 100644 --- a/test-tool/0181_writesame10_unmap_unaligned.c +++ b/test-tool/0181_writesame10_unmap_unaligned.c @@ -110,6 +110,7 @@ int T0181_writesame10_unmap_unaligned(const char *initiator, const char *url, in printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (task->status == SCSI_STATUS_GOOD) { diff --git a/test-tool/0182_writesame10_beyondeol.c b/test-tool/0182_writesame10_beyondeol.c index 9bcf021..1920bbb 100644 --- a/test-tool/0182_writesame10_beyondeol.c +++ b/test-tool/0182_writesame10_beyondeol.c @@ -98,6 +98,7 @@ int T0182_writesame10_beyondeol(const char *initiator, const char *url, int data printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (task->status == SCSI_STATUS_GOOD) { diff --git a/test-tool/0183_writesame10_wrprotect.c b/test-tool/0183_writesame10_wrprotect.c index b39bb6e..fc8f118 100644 --- a/test-tool/0183_writesame10_wrprotect.c +++ b/test-tool/0183_writesame10_wrprotect.c @@ -96,6 +96,7 @@ int T0183_writesame10_wrprotect(const char *initiator, const char *url, int data printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (task->status == SCSI_STATUS_GOOD) { diff --git a/test-tool/0184_writesame10_0blocks.c b/test-tool/0184_writesame10_0blocks.c index 1763734..ad7f96b 100644 --- a/test-tool/0184_writesame10_0blocks.c +++ b/test-tool/0184_writesame10_0blocks.c @@ -97,6 +97,7 @@ int T0184_writesame10_0blocks(const char *initiator, const char *url, int data_l printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (task->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/0190_writesame16_unmap.c b/test-tool/0190_writesame16_unmap.c index 6bdca3b..c998c33 100644 --- a/test-tool/0190_writesame16_unmap.c +++ b/test-tool/0190_writesame16_unmap.c @@ -172,6 +172,7 @@ test2: printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (lbpws) { diff --git a/test-tool/0191_writesame16_unmap_unaligned.c b/test-tool/0191_writesame16_unmap_unaligned.c index cbc3c3b..cb65753 100644 --- a/test-tool/0191_writesame16_unmap_unaligned.c +++ b/test-tool/0191_writesame16_unmap_unaligned.c @@ -110,6 +110,7 @@ int T0191_writesame16_unmap_unaligned(const char *initiator, const char *url, in printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (task->status == SCSI_STATUS_GOOD) { diff --git a/test-tool/0192_writesame16_beyondeol.c b/test-tool/0192_writesame16_beyondeol.c index 8fdc985..52459ad 100644 --- a/test-tool/0192_writesame16_beyondeol.c +++ b/test-tool/0192_writesame16_beyondeol.c @@ -97,6 +97,7 @@ int T0192_writesame16_beyondeol(const char *initiator, const char *url, int data printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (task->status == SCSI_STATUS_GOOD) { diff --git a/test-tool/0193_writesame16_wrprotect.c b/test-tool/0193_writesame16_wrprotect.c index 7bc36b5..a9e5a6a 100644 --- a/test-tool/0193_writesame16_wrprotect.c +++ b/test-tool/0193_writesame16_wrprotect.c @@ -96,6 +96,7 @@ int T0193_writesame16_wrprotect(const char *initiator, const char *url, int data printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (task->status == SCSI_STATUS_GOOD) { diff --git a/test-tool/0194_writesame16_0blocks.c b/test-tool/0194_writesame16_0blocks.c index ab350d3..1d3c4b1 100644 --- a/test-tool/0194_writesame16_0blocks.c +++ b/test-tool/0194_writesame16_0blocks.c @@ -97,6 +97,7 @@ int T0194_writesame16_0blocks(const char *initiator, const char *url, int data_l printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (task->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/0270_verify16_simple.c b/test-tool/0270_verify16_simple.c index 1a7863b..e79b498 100644 --- a/test-tool/0270_verify16_simple.c +++ b/test-tool/0270_verify16_simple.c @@ -115,6 +115,7 @@ int T0270_verify16_simple(const char *initiator, const char *url, int data_loss printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); scsi_free_scsi_task(vtask); + ret = -2; goto finished; } if (vtask->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/0271_verify16_mismatch.c b/test-tool/0271_verify16_mismatch.c index e79bc17..90c625a 100644 --- a/test-tool/0271_verify16_mismatch.c +++ b/test-tool/0271_verify16_mismatch.c @@ -118,6 +118,7 @@ int T0271_verify16_mismatch(const char *initiator, const char *url, int data_los printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); scsi_free_scsi_task(vtask); + ret = -2; goto finished; } if (vtask->status == SCSI_STATUS_GOOD) { diff --git a/test-tool/0272_verify16_mismatch_no_cmp.c b/test-tool/0272_verify16_mismatch_no_cmp.c index 1677fdb..ea63362 100644 --- a/test-tool/0272_verify16_mismatch_no_cmp.c +++ b/test-tool/0272_verify16_mismatch_no_cmp.c @@ -121,6 +121,7 @@ int T0272_verify16_mismatch_no_cmp(const char *initiator, const char *url, int d printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); scsi_free_scsi_task(vtask); + ret = -2; goto finished; } if (vtask->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/0273_verify16_beyondeol.c b/test-tool/0273_verify16_beyondeol.c index c012433..f5d018d 100644 --- a/test-tool/0273_verify16_beyondeol.c +++ b/test-tool/0273_verify16_beyondeol.c @@ -85,6 +85,15 @@ int T0273_verify16_beyondeol(const char *initiator, const char *url, int data_lo ret = -1; goto finished; } + if (task->status == SCSI_STATUS_CHECK_CONDITION + && task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST + && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { + printf("[SKIPPED]\n"); + printf("Opcode is not implemented on target\n"); + scsi_free_scsi_task(task); + ret = -2; + goto finished; + } if (task->status == SCSI_STATUS_GOOD) { printf("[FAILED]\n"); printf("Verify16 command should fail when reading beyond end of device\n"); @@ -145,14 +154,6 @@ int T0273_verify16_beyondeol(const char *initiator, const char *url, int data_lo ret = -1; goto test2; } - if (task->status == SCSI_STATUS_CHECK_CONDITION - && task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST - && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { - printf("[SKIPPED]\n"); - printf("Opcode is not implemented on target\n"); - scsi_free_scsi_task(task); - goto finished; - } if (task->status == SCSI_STATUS_GOOD) { printf("[FAILED]\n"); printf("verify16 command should fail when reading at LBA -1\n"); diff --git a/test-tool/0280_verify12_simple.c b/test-tool/0280_verify12_simple.c index 4bf762c..7c73271 100644 --- a/test-tool/0280_verify12_simple.c +++ b/test-tool/0280_verify12_simple.c @@ -115,6 +115,7 @@ int T0280_verify12_simple(const char *initiator, const char *url, int data_loss printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); scsi_free_scsi_task(vtask); + ret = -2; goto finished; } if (vtask->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/0281_verify12_mismatch.c b/test-tool/0281_verify12_mismatch.c index 08f189f..f040711 100644 --- a/test-tool/0281_verify12_mismatch.c +++ b/test-tool/0281_verify12_mismatch.c @@ -29,7 +29,6 @@ int T0281_verify12_mismatch(const char *initiator, const char *url, int data_los struct scsi_readcapacity16 *rc16; int ret, i, lun; uint32_t block_size; - uint64_t num_blocks; printf("0281_verify12_mismatch:\n"); printf("=======================\n"); @@ -67,7 +66,6 @@ int T0281_verify12_mismatch(const char *initiator, const char *url, int data_los goto finished; } block_size = rc16->block_length; - num_blocks = rc16->returned_lba; scsi_free_scsi_task(task); @@ -120,6 +118,7 @@ int T0281_verify12_mismatch(const char *initiator, const char *url, int data_los printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); scsi_free_scsi_task(vtask); + ret = -2; goto finished; } if (vtask->status == SCSI_STATUS_GOOD) { diff --git a/test-tool/0282_verify12_mismatch_no_cmp.c b/test-tool/0282_verify12_mismatch_no_cmp.c index ccd655f..8b2ddbd 100644 --- a/test-tool/0282_verify12_mismatch_no_cmp.c +++ b/test-tool/0282_verify12_mismatch_no_cmp.c @@ -121,6 +121,7 @@ int T0282_verify12_mismatch_no_cmp(const char *initiator, const char *url, int d printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); scsi_free_scsi_task(vtask); + ret = -2; goto finished; } if (vtask->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/0283_verify12_beyondeol.c b/test-tool/0283_verify12_beyondeol.c index 353d613..05bd2af 100644 --- a/test-tool/0283_verify12_beyondeol.c +++ b/test-tool/0283_verify12_beyondeol.c @@ -89,6 +89,7 @@ int T0283_verify12_beyondeol(const char *initiator, const char *url, int data_lo printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (task->status == SCSI_STATUS_GOOD) { diff --git a/test-tool/0340_compareandwrite_simple.c b/test-tool/0340_compareandwrite_simple.c index 1077854..af97ced 100644 --- a/test-tool/0340_compareandwrite_simple.c +++ b/test-tool/0340_compareandwrite_simple.c @@ -123,6 +123,7 @@ int T0340_compareandwrite_simple(const char *initiator, const char *url, int dat printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (task->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/0341_compareandwrite_mismatch.c b/test-tool/0341_compareandwrite_mismatch.c index 2db049e..eb0ce7a 100644 --- a/test-tool/0341_compareandwrite_mismatch.c +++ b/test-tool/0341_compareandwrite_mismatch.c @@ -126,6 +126,7 @@ int T0341_compareandwrite_mismatch(const char *initiator, const char *url, int d printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (task->status == SCSI_STATUS_GOOD) { diff --git a/test-tool/0343_compareandwrite_beyondeol.c b/test-tool/0343_compareandwrite_beyondeol.c index f1bbb62..3afb0c8 100644 --- a/test-tool/0343_compareandwrite_beyondeol.c +++ b/test-tool/0343_compareandwrite_beyondeol.c @@ -97,6 +97,7 @@ int T0343_compareandwrite_beyondeol(const char *initiator, const char *url, int printf("[SKIPPED]\n"); printf("Opcode is not implemented on target\n"); scsi_free_scsi_task(task); + ret = -2; goto finished; } if (task->status == SCSI_STATUS_GOOD) {