From fe1017fe2a6a1068e9b698c97e75b7d9d80eede7 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Sat, 19 Sep 2015 16:06:05 -0700 Subject: [PATCH] TESTS: Don't test WriteSame10/16 if we do not have BlockLimits VPD Signed-off-by: Ronnie Sahlberg --- test-tool/test_writesame10_0blocks.c | 7 ++++++- test-tool/test_writesame16_0blocks.c | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/test-tool/test_writesame10_0blocks.c b/test-tool/test_writesame10_0blocks.c index b14e2bd..70f9dc3 100644 --- a/test-tool/test_writesame10_0blocks.c +++ b/test-tool/test_writesame10_0blocks.c @@ -36,8 +36,13 @@ test_writesame10_0blocks(void) CU_PASS("LUN is too big for write-beyond-eol tests with WRITESAME10. Skipping test.\n"); return; } + if (!inq_bl) { + CU_PASS("BlockLimits VPD is not available. Skipping test.\n"); + return; + } logging(LOG_VERBOSE, LOG_BLANK_LINE); + logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks at LBA==0 (WSNZ=%d)", inq_bl->wsnz); memset(buf, 0, block_size); @@ -46,7 +51,7 @@ test_writesame10_0blocks(void) ret = writesame10(sd, 0, block_size, 0, 0, 0, 0, 0, buf, 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); return; } diff --git a/test-tool/test_writesame16_0blocks.c b/test-tool/test_writesame16_0blocks.c index 41f4d68..049c7bb 100644 --- a/test-tool/test_writesame16_0blocks.c +++ b/test-tool/test_writesame16_0blocks.c @@ -32,6 +32,11 @@ test_writesame16_0blocks(void) CHECK_FOR_DATALOSS; 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, "Test WRITESAME16 0-blocks at LBA==0 (WSNZ=%d)", inq_bl->wsnz);