From 73d541b00bf54c1638ad2abe3d799407c926153f Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Thu, 29 Jul 2021 17:39:39 +0200 Subject: [PATCH] test: fix ExtendedCopy.Large SKIPPED cases CU_PASS() needs to be coupled with a return to actually skip the test. Similarly, the CU_PASS message isn't printed, so a logging() call is also needed here. Signed-off-by: David Disseldorp --- test-tool/test_extendedcopy_simple.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test-tool/test_extendedcopy_simple.c b/test-tool/test_extendedcopy_simple.c index 0f75945..b5761b9 100644 --- a/test-tool/test_extendedcopy_simple.c +++ b/test-tool/test_extendedcopy_simple.c @@ -134,13 +134,19 @@ test_extendedcopy_large(void) scsi_free_scsi_task(edl_task); if (cp_len_bytes == 0) { + logging(LOG_NORMAL, + "[SKIPPED] BLK_TO_BLK_OFF_SEG_DESCR not supported"); CU_PASS("[SKIPPED] BLK_TO_BLK_OFF_SEG_DESCR not supported"); + return; } if (cp_len_bytes > TEST_XCOPY_LARGE_CP_LEN_MAX) { cp_len_bytes = TEST_XCOPY_LARGE_CP_LEN_MAX; } if (num_blocks < (cp_len_bytes / block_size) * 2) { + logging(LOG_NORMAL, + "[SKIPPED] device too small to handle maxlen XCOPY"); CU_PASS("[SKIPPED] device too small to handle maxlen XCOPY"); + return; } write_blocks = num_blocks / 2;