From 3aec1a37a913621273f16fc8c7d97425063e73d9 Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Thu, 7 May 2015 07:04:56 -0400 Subject: [PATCH] Skip unsupported tests instead of failing * SCSI_REPORT_SUPPORTING_OPCODE * SCSI_REPORT_SUPPORTING_SERVICEACTION --- .../test_report_supported_opcodes_one_command.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/test-tool/test_report_supported_opcodes_one_command.c b/test-tool/test_report_supported_opcodes_one_command.c index d11eca9..6e22138 100644 --- a/test-tool/test_report_supported_opcodes_one_command.c +++ b/test-tool/test_report_supported_opcodes_one_command.c @@ -88,7 +88,13 @@ test_report_supported_opcodes_one_command(void) 65535, EXPECT_STATUS_GOOD); } - CU_ASSERT_EQUAL(ret, 0); + if (ret == -2) { + logging(LOG_NORMAL, "[SKIPPED] SCSI_REPORT_SUPPORTING_OPCODE is not " + "implemented."); + CU_PASS("SCSI_REPORT_SUPPORTING_OPCODE is not implemented."); + } else { + CU_ASSERT_EQUAL(ret, 0); + } if (rsoc->descriptors[i].servactv) { logging(LOG_VERBOSE, "This opcode has service actions. " @@ -112,7 +118,13 @@ test_report_supported_opcodes_one_command(void) 65535, EXPECT_INVALID_FIELD_IN_CDB); } - CU_ASSERT_EQUAL(ret, 0); + if (ret == -2) { + logging(LOG_NORMAL, "[SKIPPED] SCSI_REPORT_SUPPORTING_SERVICEACTION is not " + "implemented."); + CU_PASS("SCSI_REPORT_SUPPORTING_SERVICEACTION is not implemented."); + } else { + CU_ASSERT_EQUAL(ret, 0); + } }