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

test_extended_copy_simple: Limit transfer size to half of the capacity

Browse Source 
This avoids that the test fails for LUNs with less than 2048 blocks.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
This commit is contained in:
Bart Van Assche
2017-05-10 10:13:07 -07:00
committed by Ronnie Sahlberg
parent 1af120d2c3
commit 0241fe8014
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
test-tool/test_extendedcopy_simple.c
View File

@@ -33,18 +33,27 @@ test_extendedcopy_simple(void)
int tgt_desc_len = 0, seg_desc_len = 0, offset = XCOPY_DESC_OFFSET; int tgt_desc_len = 0, seg_desc_len = 0, offset = XCOPY_DESC_OFFSET;
struct iscsi_data data; struct iscsi_data data;
unsigned char *xcopybuf; unsigned char *xcopybuf;
unsigned char *buf1 = malloc(2048*block_size); unsigned int copied_blocks;
unsigned char *buf2 = malloc(2048*block_size); unsigned char *buf1;
unsigned char *buf2;
copied_blocks = num_blocks / 2;
if (copied_blocks > 2048)
copied_blocks = 2048;
buf1 = malloc(copied_blocks * block_size);
buf2 = malloc(copied_blocks * block_size);
logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, LOG_BLANK_LINE);
logging(LOG_VERBOSE, logging(LOG_VERBOSE,
"Test EXTENDED COPY of 2048 blocks from start of LUN to end of LUN"); "Test EXTENDED COPY of %u blocks from start of LUN to end of LUN",
copied_blocks);
CHECK_FOR_DATALOSS; CHECK_FOR_DATALOSS;
logging(LOG_VERBOSE, "Write 2048 blocks of 'A' at LBA:0"); logging(LOG_VERBOSE, "Write %u blocks of 'A' at LBA:0", copied_blocks);
memset(buf1, 'A', 2048*block_size); memset(buf1, 'A', copied_blocks * block_size);
WRITE16(sd, 0, 2048*block_size, block_size, 0, 0, 0, 0, 0, WRITE16(sd, 0, copied_blocks * block_size, block_size, 0, 0, 0, 0, 0,
buf1, EXPECT_STATUS_GOOD); buf1, EXPECT_STATUS_GOOD);
data.size = XCOPY_DESC_OFFSET + data.size = XCOPY_DESC_OFFSET +
@@ -61,7 +70,7 @@ test_extendedcopy_simple(void)
/* Iniitialize segment descriptor list with one segment descriptor */ /* Iniitialize segment descriptor list with one segment descriptor */
offset += populate_seg_desc_b2b(xcopybuf+offset, 0, 0, 0, 0, offset += populate_seg_desc_b2b(xcopybuf+offset, 0, 0, 0, 0,
2048, 0, num_blocks - 2048); copied_blocks, 0, num_blocks - copied_blocks);
seg_desc_len = offset - XCOPY_DESC_OFFSET - tgt_desc_len; seg_desc_len = offset - XCOPY_DESC_OFFSET - tgt_desc_len;
/* Initialize the parameter list header */ /* Initialize the parameter list header */
@@ -70,12 +79,13 @@ test_extendedcopy_simple(void)
EXTENDEDCOPY(sd, &data, EXPECT_STATUS_GOOD); EXTENDEDCOPY(sd, &data, EXPECT_STATUS_GOOD);
logging(LOG_VERBOSE, "Read 2048 blocks from end of the LUN"); logging(LOG_VERBOSE, "Read %u blocks from end of the LUN",
READ16(sd, NULL, num_blocks - 2048, 2048*block_size, copied_blocks);
READ16(sd, NULL, num_blocks - copied_blocks, copied_blocks * block_size,
block_size, 0, 0, 0, 0, 0, buf2, block_size, 0, 0, 0, 0, 0, buf2,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
if (memcmp(buf1, buf2, 2048*block_size)) { if (memcmp(buf1, buf2, copied_blocks * block_size)) {
CU_FAIL("Blocks were not copied correctly"); CU_FAIL("Blocks were not copied correctly");
} }