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

TESTS more writesame1* test fixes

Browse Source
This commit is contained in:
Ronnie Sahlberg
2013-08-25 16:39:38 -07:00
parent ab600e39b0
commit daac72a8f9
11 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test-tool/test_writesame10_unmap.c
View File

@@ -31,7 +31,7 @@ test_writesame10_unmap(void)
{
int i, ret;
unsigned int j;
unsigned char *buf = malloc(block_size * 256);
unsigned char *buf = alloca(256 * block_size);
CHECK_FOR_DATALOSS;
CHECK_FOR_THIN_PROVISIONING;
@@ -43,16 +43,17 @@ test_writesame10_unmap(void)
"the LUN");
for (i = 1; i <= 256; i++) {
logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i);
memset(buf, 0xff, block_size * i);
memset(buf, 0xff, i * block_size);
ret = write10(iscsic, tgt_lun, 0,
i * block_size, block_size,
0, 0, 0, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10", i);
memset(buf, 0, block_size);
ret = writesame10(iscsic, tgt_lun, 0,
block_size, i,
0, 1, 0, 0, NULL);
0, 1, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0);
if (rc16->lbprz) {
@@ -80,13 +81,14 @@ test_writesame10_unmap(void)
"the LUN");
for (i = 1; i <= 256; i++) {
logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i);
memset(buf, 0xff, block_size * i);
memset(buf, 0xff, i * block_size);
ret = write10(iscsic, tgt_lun, num_blocks - i,
i * block_size, block_size,
0, 0, 0, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10", i);
memset(buf, 0, block_size);
ret = writesame10(iscsic, tgt_lun, num_blocks - i,
block_size, i,
0, 1, 0, 0, buf);
@@ -116,22 +118,23 @@ test_writesame10_unmap(void)
"invalid");
ret = writesame10_invalidfieldincdb(iscsic, tgt_lun, 0,
block_size, 1,
1, 0, 0, 0, NULL);
1, 0, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0);
if (inq_lbp->anc_sup) {
logging(LOG_VERBOSE, "Test WRITESAME10 ANCHOR==1 + UNMAP==0");
memset(buf, 0, block_size);
ret = writesame10(iscsic, tgt_lun, 0,
block_size, 1,
1, 1, 0, 0, NULL);
1, 1, 0, 0, buf);
} else {
logging(LOG_VERBOSE, "Test WRITESAME10 ANCHOR==1 + UNMAP==0 no "
"ANC_SUP so expecting to fail");
ret = writesame10_invalidfieldincdb(iscsic, tgt_lun, 0,
block_size, 1,
1, 1, 0, 0, NULL);
1, 1, 0, 0, buf);
}
CU_ASSERT_EQUAL(ret, 0);
@@ -141,7 +144,6 @@ test_writesame10_unmap(void)
"BlockLimits VPD is missing.");
CU_FAIL("[FAILED] WRITESAME10 works but "
"BlockLimits VPD is missing.");
free(buf);
return;
}
@@ -153,16 +155,17 @@ test_writesame10_unmap(void)
"lengths");
logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i);
memset(buf, 0xff, block_size * i);
memset(buf, 0xff, i * block_size);
ret = write10(iscsic, tgt_lun, 0,
i * block_size, block_size,
0, 0, 0, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10", i);
memset(buf, 0, block_size);
ret = writesame10(iscsic, tgt_lun, 0,
block_size, i,
0, 1, 0, 0, NULL);
0, 1, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0);
if (rc16->lbprz) {
@@ -191,8 +194,7 @@ test_writesame10_unmap(void)
logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10", i);
ret = writesame10_invalidfieldincdb(iscsic, tgt_lun, 0,
block_size, i,
0, 1, 0, 0, NULL);
0, 1, 0, 0, buf);
CU_ASSERT_EQUAL(ret, 0);
}
free(buf);
}