From efedc022242773cae20bfb3bd65563ac406a7f0a Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Sun, 21 Feb 2016 14:50:59 -0800 Subject: [PATCH] Test: Add helper for MODESENSE6 Signed-off-by: Ronnie Sahlberg --- test-tool/iscsi-support.h | 14 ++++++++++++++ test-tool/test_compareandwrite_dpofua.c | 8 ++++---- test-tool/test_modesense6_all_pages.c | 9 +++------ test-tool/test_modesense6_control.c | 17 +++++++---------- test-tool/test_modesense6_control_swp.c | 8 +++----- test-tool/test_modesense6_residuals.c | 17 +++++++---------- test-tool/test_orwrite_dpofua.c | 10 +++++----- test-tool/test_read10_dpofua.c | 10 +++++----- test-tool/test_read12_dpofua.c | 10 +++++----- test-tool/test_read16_dpofua.c | 10 +++++----- test-tool/test_reserve6_2initiators.c | 12 ++++++------ test-tool/test_verify10_dpo.c | 10 +++++----- test-tool/test_verify12_dpo.c | 10 +++++----- test-tool/test_verify16_dpo.c | 10 +++++----- test-tool/test_write10_dpofua.c | 11 +++++------ test-tool/test_write12_dpofua.c | 10 +++++----- test-tool/test_write16_dpofua.c | 11 +++++------ test-tool/test_writeatomic16_dpofua.c | 10 +++++----- test-tool/test_writeverify10_dpo.c | 10 +++++----- test-tool/test_writeverify12_dpo.c | 10 +++++----- test-tool/test_writeverify16_dpo.c | 10 +++++----- 21 files changed, 114 insertions(+), 113 deletions(-) diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h index 97c9e31..f11dacf 100644 --- a/test-tool/iscsi-support.h +++ b/test-tool/iscsi-support.h @@ -223,6 +223,20 @@ do { \ CU_ASSERT_EQUAL(_r, 0); \ } while (0); +#define MODESENSE6(...) \ + do { \ + int _r; \ + _r = modesense6(__VA_ARGS__); \ + if (_r == -2) { \ + logging(LOG_NORMAL, "[SKIPPED] MODESENSE6 " \ + "is not implemented."); \ + CU_PASS("[SKIPPED] Target does not support " \ + "MODESENSE6. Skipping test"); \ + return; \ + } \ + CU_ASSERT_EQUAL(_r, 0); \ + } while (0); + #define ORWRITE(...) \ do { \ int _r; \ diff --git a/test-tool/test_compareandwrite_dpofua.c b/test-tool/test_compareandwrite_dpofua.c index 428dff3..5a73eaa 100644 --- a/test-tool/test_compareandwrite_dpofua.c +++ b/test-tool/test_compareandwrite_dpofua.c @@ -42,10 +42,10 @@ test_compareandwrite_dpofua(void) CHECK_FOR_DATALOSS; logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); diff --git a/test-tool/test_modesense6_all_pages.c b/test-tool/test_modesense6_all_pages.c index 2c6ef19..bef4c43 100644 --- a/test-tool/test_modesense6_all_pages.c +++ b/test-tool/test_modesense6_all_pages.c @@ -30,20 +30,17 @@ test_modesense6_all_pages(void) { struct scsi_mode_sense *ms; struct scsi_task *ms_task = NULL; - int ret; logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test of MODESENSE6 AllPages"); logging(LOG_VERBOSE, "Send MODESENSE6 command to fetch AllPages"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "[SUCCESS] All Pages fetched."); - logging(LOG_VERBOSE, "Try to unmarshall the DATA-IN buffer."); ms = scsi_datain_unmarshall(ms_task); if (ms == NULL) { diff --git a/test-tool/test_modesense6_control.c b/test-tool/test_modesense6_control.c index 5d06712..7160e0d 100644 --- a/test-tool/test_modesense6_control.c +++ b/test-tool/test_modesense6_control.c @@ -33,18 +33,16 @@ test_modesense6_control(void) struct scsi_mode_page *ct_page; struct scsi_task *ap_task = NULL; struct scsi_task *ct_task = NULL; - int ret; logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test of MODESENSE6 CONTROL page"); - logging(LOG_VERBOSE, "Fetch the CONTROL page via AllPages"); logging(LOG_VERBOSE, "Send MODESENSE6 command to fetch AllPages"); - ret = modesense6(sd, &ap_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ap_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] All Pages fetched."); @@ -82,10 +80,9 @@ test_modesense6_control(void) logging(LOG_VERBOSE, "Fetch the CONTROL page directly"); logging(LOG_VERBOSE, "Send MODESENSE6 command to fetch CONTROL"); - ret = modesense6(sd, &ct_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_CONTROL, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ct_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_CONTROL, 0, 255, + EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "[SUCCESS] CONTROL page fetched."); logging(LOG_VERBOSE, "Try to unmarshall the DATA-IN buffer."); diff --git a/test-tool/test_modesense6_control_swp.c b/test-tool/test_modesense6_control_swp.c index abb4113..bc196f6 100644 --- a/test-tool/test_modesense6_control_swp.c +++ b/test-tool/test_modesense6_control_swp.c @@ -40,7 +40,6 @@ test_modesense6_control_swp(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test of MODESENSE6 CONTROL SWP flag"); - logging(LOG_VERBOSE, "Set SWP to enable write protect"); ret = set_swp(sd); if (ret == -2) { @@ -53,10 +52,9 @@ test_modesense6_control_swp(void) } logging(LOG_VERBOSE, "Read the CONTROL page back from the device"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_CONTROL, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_CONTROL, 0, 255, + EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "[SUCCESS] CONTROL page fetched."); logging(LOG_VERBOSE, "Try to unmarshall the DATA-IN buffer."); diff --git a/test-tool/test_modesense6_residuals.c b/test-tool/test_modesense6_residuals.c index e5aafee..5fe69cb 100644 --- a/test-tool/test_modesense6_residuals.c +++ b/test-tool/test_modesense6_residuals.c @@ -29,7 +29,6 @@ void test_modesense6_residuals(void) { struct scsi_task *ms_task = NULL; - int ret; logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test of MODESENSE6 Residuals"); @@ -40,12 +39,11 @@ test_modesense6_residuals(void) logging(LOG_VERBOSE, "Try a MODESENSE6 command with 4 bytes of " "transfer length and verify that we don't get residuals."); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 4, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); - logging(LOG_VERBOSE, "[SUCCESS] All Pages fetched."); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 4, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] All Pages fetched."); logging(LOG_VERBOSE, "Verify that we got at most 4 bytes of DATA-IN"); if (ms_task->datain.size > 4) { @@ -70,10 +68,9 @@ test_modesense6_residuals(void) logging(LOG_VERBOSE, "Try a MODESENSE6 command with 255 bytes of " "transfer length and verify that we get residuals if the target returns less than the requested amount of data."); scsi_free_scsi_task(ms_task); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "[SUCCESS] All Pages fetched."); if (ms_task->datain.size == 255) { diff --git a/test-tool/test_orwrite_dpofua.c b/test-tool/test_orwrite_dpofua.c index af7febe..4a9137a 100644 --- a/test-tool/test_orwrite_dpofua.c +++ b/test-tool/test_orwrite_dpofua.c @@ -29,7 +29,7 @@ void test_orwrite_dpofua(void) { - int ret, dpofua, usage_data_dpofua; + int dpofua, usage_data_dpofua; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -42,10 +42,10 @@ test_orwrite_dpofua(void) CHECK_FOR_DATALOSS; logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); diff --git a/test-tool/test_read10_dpofua.c b/test-tool/test_read10_dpofua.c index d4781d9..f2dbe9e 100644 --- a/test-tool/test_read10_dpofua.c +++ b/test-tool/test_read10_dpofua.c @@ -29,7 +29,7 @@ void test_read10_dpofua(void) { - int ret, dpofua, usage_data_dpofua; + int dpofua, usage_data_dpofua; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -41,10 +41,10 @@ test_read10_dpofua(void) CHECK_FOR_SBC; logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); diff --git a/test-tool/test_read12_dpofua.c b/test-tool/test_read12_dpofua.c index 9150536..8b88a00 100644 --- a/test-tool/test_read12_dpofua.c +++ b/test-tool/test_read12_dpofua.c @@ -29,7 +29,7 @@ void test_read12_dpofua(void) { - int ret, dpofua, usage_data_dpofua; + int dpofua, usage_data_dpofua; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -41,10 +41,10 @@ test_read12_dpofua(void) CHECK_FOR_SBC; logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); diff --git a/test-tool/test_read16_dpofua.c b/test-tool/test_read16_dpofua.c index f9f5b54..91968f6 100644 --- a/test-tool/test_read16_dpofua.c +++ b/test-tool/test_read16_dpofua.c @@ -29,7 +29,7 @@ void test_read16_dpofua(void) { - int ret, dpofua, usage_data_dpofua; + int dpofua, usage_data_dpofua; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -41,10 +41,10 @@ test_read16_dpofua(void) CHECK_FOR_SBC; logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); diff --git a/test-tool/test_reserve6_2initiators.c b/test-tool/test_reserve6_2initiators.c index 080e7ac..0d642a9 100644 --- a/test-tool/test_reserve6_2initiators.c +++ b/test-tool/test_reserve6_2initiators.c @@ -63,14 +63,14 @@ test_reserve6_2initiators(void) RELEASE6(sd2); logging(LOG_NORMAL, "Test we can still send MODE SENSE from the first initiator"); - ret = modesense6(sd, NULL, 0, SCSI_MODESENSE_PC_CURRENT, SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, NULL, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); logging(LOG_NORMAL, "MODE SENSE should fail from the second initiator"); - ret = modesense6(sd2, NULL, 0, SCSI_MODESENSE_PC_CURRENT, SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_RESERVATION_CONFLICT); - + MODESENSE6(sd2, NULL, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_RESERVATION_CONFLICT); logging(LOG_NORMAL, "RESERVE6 from the second initiator should still fail"); ret = reserve6_conflict(sd2); diff --git a/test-tool/test_verify10_dpo.c b/test-tool/test_verify10_dpo.c index d1f874a..3ac3308 100644 --- a/test-tool/test_verify10_dpo.c +++ b/test-tool/test_verify10_dpo.c @@ -29,7 +29,7 @@ void test_verify10_dpo(void) { - int ret, dpofua, usage_data_dpo; + int dpofua, usage_data_dpo; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -44,10 +44,10 @@ test_verify10_dpo(void) EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); diff --git a/test-tool/test_verify12_dpo.c b/test-tool/test_verify12_dpo.c index 381e3be..6f0fafd 100644 --- a/test-tool/test_verify12_dpo.c +++ b/test-tool/test_verify12_dpo.c @@ -29,7 +29,7 @@ void test_verify12_dpo(void) { - int ret, dpofua, usage_data_dpo; + int dpofua, usage_data_dpo; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -44,10 +44,10 @@ test_verify12_dpo(void) EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); diff --git a/test-tool/test_verify16_dpo.c b/test-tool/test_verify16_dpo.c index d3eecdc..aa206f9 100644 --- a/test-tool/test_verify16_dpo.c +++ b/test-tool/test_verify16_dpo.c @@ -29,7 +29,7 @@ void test_verify16_dpo(void) { - int ret, dpofua, usage_data_dpo; + int dpofua, usage_data_dpo; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -44,10 +44,10 @@ test_verify16_dpo(void) EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); diff --git a/test-tool/test_write10_dpofua.c b/test-tool/test_write10_dpofua.c index ce39ff5..f13a207 100644 --- a/test-tool/test_write10_dpofua.c +++ b/test-tool/test_write10_dpofua.c @@ -29,7 +29,7 @@ void test_write10_dpofua(void) { - int ret, dpofua, usage_data_dpofua; + int dpofua, usage_data_dpofua; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -42,10 +42,10 @@ test_write10_dpofua(void) CHECK_FOR_DATALOSS; logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); @@ -82,7 +82,6 @@ test_write10_dpofua(void) if (dpofua) { WRITE10(sd, 0, block_size, block_size, 0, 1, 1, 0, 0, scratch, EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); } else { WRITE10(sd, 0, block_size, block_size, 0, 1, 1, 0, 0, scratch, EXPECT_INVALID_FIELD_IN_CDB); diff --git a/test-tool/test_write12_dpofua.c b/test-tool/test_write12_dpofua.c index 44adb4f..196892f 100644 --- a/test-tool/test_write12_dpofua.c +++ b/test-tool/test_write12_dpofua.c @@ -29,7 +29,7 @@ void test_write12_dpofua(void) { - int ret, dpofua, usage_data_dpofua; + int dpofua, usage_data_dpofua; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -42,10 +42,10 @@ test_write12_dpofua(void) CHECK_FOR_DATALOSS; logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); diff --git a/test-tool/test_write16_dpofua.c b/test-tool/test_write16_dpofua.c index bafc8aa..60f486a 100644 --- a/test-tool/test_write16_dpofua.c +++ b/test-tool/test_write16_dpofua.c @@ -29,7 +29,7 @@ void test_write16_dpofua(void) { - int ret, dpofua, usage_data_dpofua; + int dpofua, usage_data_dpofua; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -42,10 +42,10 @@ test_write16_dpofua(void) CHECK_FOR_DATALOSS; logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); @@ -82,7 +82,6 @@ test_write16_dpofua(void) if (dpofua) { WRITE16(sd, 0, block_size, block_size, 0, 1, 1, 0, 0, scratch, EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); } else { WRITE16(sd, 0, block_size, block_size, 0, 1, 1, 0, 0, scratch, EXPECT_INVALID_FIELD_IN_CDB); diff --git a/test-tool/test_writeatomic16_dpofua.c b/test-tool/test_writeatomic16_dpofua.c index e743f0b..2193d90 100644 --- a/test-tool/test_writeatomic16_dpofua.c +++ b/test-tool/test_writeatomic16_dpofua.c @@ -29,7 +29,7 @@ void test_writeatomic16_dpofua(void) { - int ret, gran, dpofua, usage_data_dpofua; + int gran, dpofua, usage_data_dpofua; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -49,10 +49,10 @@ test_writeatomic16_dpofua(void) gran = inq_bl->atomic_gran ? inq_bl->atomic_gran : 1; logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); diff --git a/test-tool/test_writeverify10_dpo.c b/test-tool/test_writeverify10_dpo.c index 000a5ca..bbd8873 100644 --- a/test-tool/test_writeverify10_dpo.c +++ b/test-tool/test_writeverify10_dpo.c @@ -29,7 +29,7 @@ void test_writeverify10_dpo(void) { - int ret, dpofua, usage_data_dpo; + int dpofua, usage_data_dpo; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -44,10 +44,10 @@ test_writeverify10_dpo(void) EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); diff --git a/test-tool/test_writeverify12_dpo.c b/test-tool/test_writeverify12_dpo.c index 91290f8..d71576a 100644 --- a/test-tool/test_writeverify12_dpo.c +++ b/test-tool/test_writeverify12_dpo.c @@ -29,7 +29,7 @@ void test_writeverify12_dpo(void) { - int ret, dpofua, usage_data_dpo; + int dpofua, usage_data_dpo; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -44,10 +44,10 @@ test_writeverify12_dpo(void) EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10); diff --git a/test-tool/test_writeverify16_dpo.c b/test-tool/test_writeverify16_dpo.c index 7d57d95..8cc1473 100644 --- a/test-tool/test_writeverify16_dpo.c +++ b/test-tool/test_writeverify16_dpo.c @@ -29,7 +29,7 @@ void test_writeverify16_dpo(void) { - int ret, dpofua, usage_data_dpo; + int dpofua, usage_data_dpo; struct scsi_task *ms_task = NULL; struct scsi_mode_sense *ms; struct scsi_task *rso_task = NULL; @@ -44,10 +44,10 @@ test_writeverify16_dpo(void) EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "Read the DPOFUA flag from mode sense data"); - ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, - SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, - EXPECT_STATUS_GOOD); - CU_ASSERT_EQUAL(ret, 0); + MODESENSE6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT, + SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255, + EXPECT_STATUS_GOOD); + logging(LOG_VERBOSE, "[SUCCESS] Mode sense returned status GOOD"); ms = scsi_datain_unmarshall(ms_task); dpofua = ms && (ms->device_specific_parameter & 0x10);