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

TESTS: Don't test WriteSame10/16 if we do not have BlockLimits VPD

Browse Source 
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2015-09-19 16:06:05 -07:00
parent 67932e870e
commit fe1017fe2a
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test-tool/test_writesame10_0blocks.c
View File

@@ -36,8 +36,13 @@ test_writesame10_0blocks(void)
CU_PASS("LUN is too big for write-beyond-eol tests with WRITESAME10. Skipping test.\n"); CU_PASS("LUN is too big for write-beyond-eol tests with WRITESAME10. Skipping test.\n");
return; return;
} }
if (!inq_bl) {
CU_PASS("BlockLimits VPD is not available. Skipping test.\n");
return;
}
logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, LOG_BLANK_LINE);
logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks at LBA==0 (WSNZ=%d)", logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks at LBA==0 (WSNZ=%d)",
inq_bl->wsnz); inq_bl->wsnz);
memset(buf, 0, block_size); memset(buf, 0, block_size);
@@ -46,7 +51,7 @@ test_writesame10_0blocks(void)
ret = writesame10(sd, 0, ret = writesame10(sd, 0,
block_size, 0, 0, 0, 0, 0, buf, block_size, 0, 0, 0, 0, 0, buf,
EXPECT_INVALID_FIELD_IN_CDB); EXPECT_INVALID_FIELD_IN_CDB);
logging(LOG_NORMAL, "[SKIPPED] WRITESAME16 does not support 0-blocks."); logging(LOG_NORMAL, "[SKIPPED] WRITESAME10 does not support 0-blocks.");
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
return; return;
} }

5
test-tool/test_writesame16_0blocks.c
View File

@@ -32,6 +32,11 @@ test_writesame16_0blocks(void)
CHECK_FOR_DATALOSS; CHECK_FOR_DATALOSS;
CHECK_FOR_SBC; CHECK_FOR_SBC;
if (!inq_bl) {
CU_PASS("BlockLimits VPD is not available. Skipping test.\n");
return;
}
logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, LOG_BLANK_LINE);
logging(LOG_VERBOSE, "Test WRITESAME16 0-blocks at LBA==0 (WSNZ=%d)", logging(LOG_VERBOSE, "Test WRITESAME16 0-blocks at LBA==0 (WSNZ=%d)",
inq_bl->wsnz); inq_bl->wsnz);