Tests: Create a global scratch buffer and avoid allocating memory in the tests
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
@@ -33,7 +33,6 @@ test_compareandwrite_simple(void)
|
||||
{
|
||||
int i, ret;
|
||||
unsigned j;
|
||||
unsigned char *buf = alloca(2 * 256 * block_size);
|
||||
int maxbl;
|
||||
|
||||
CHECK_FOR_DATALOSS;
|
||||
@@ -51,12 +50,12 @@ test_compareandwrite_simple(void)
|
||||
"start of the LUN");
|
||||
for (i = 1; i < 256; i++) {
|
||||
logging(LOG_VERBOSE, "Write %d blocks of 'A' at LBA:0", i);
|
||||
memset(buf, 'A', 2 * i * block_size);
|
||||
memset(scratch, 'A', 2 * i * block_size);
|
||||
if (maximum_transfer_length && maximum_transfer_length < i) {
|
||||
break;
|
||||
}
|
||||
ret = write16(sd, 0, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, buf,
|
||||
block_size, 0, 0, 0, 0, 0, scratch,
|
||||
EXPECT_STATUS_GOOD);
|
||||
if (ret == -2) {
|
||||
logging(LOG_NORMAL, "[SKIPPED] WRITE16 is not implemented.");
|
||||
@@ -71,7 +70,7 @@ test_compareandwrite_simple(void)
|
||||
"Command should fail with INVALID_FIELD_IN_CDB",
|
||||
i, maxbl);
|
||||
ret = compareandwrite(sd, 0,
|
||||
buf, 2 * i * block_size,
|
||||
scratch, 2 * i * block_size,
|
||||
block_size, 0, 0, 0, 0,
|
||||
EXPECT_INVALID_FIELD_IN_CDB);
|
||||
if (ret == -2) {
|
||||
@@ -84,12 +83,12 @@ test_compareandwrite_simple(void)
|
||||
continue;
|
||||
}
|
||||
|
||||
memset(buf + i * block_size, 'B', i * block_size);
|
||||
memset(scratch + i * block_size, 'B', i * block_size);
|
||||
|
||||
logging(LOG_VERBOSE, "Overwrite %d blocks with 'B' "
|
||||
"at LBA:0 (if they all contain 'A')", i);
|
||||
ret = compareandwrite(sd, 0,
|
||||
buf, 2 * i * block_size, block_size,
|
||||
scratch, 2 * i * block_size, block_size,
|
||||
0, 0, 0, 0,
|
||||
EXPECT_STATUS_GOOD);
|
||||
if (ret == -2) {
|
||||
@@ -102,15 +101,15 @@ test_compareandwrite_simple(void)
|
||||
logging(LOG_VERBOSE, "Read %d blocks at LBA:0 and verify "
|
||||
"they are all 'B'", i);
|
||||
ret = read16(sd, NULL, 0, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, buf,
|
||||
block_size, 0, 0, 0, 0, 0, scratch,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
for (j = 0; j < i * block_size; j++) {
|
||||
if (buf[j] != 'B') {
|
||||
if (scratch[j] != 'B') {
|
||||
logging(LOG_VERBOSE, "[FAILED] Data did not "
|
||||
"read back as 'B' (buf[%d] = %#02x)",
|
||||
j, buf[j]);
|
||||
"read back as 'B' (scratch[%d] = %#02x)",
|
||||
j, scratch[j]);
|
||||
CU_FAIL("Block was not written correctly");
|
||||
return;
|
||||
}
|
||||
@@ -123,12 +122,12 @@ test_compareandwrite_simple(void)
|
||||
for (i = 1; i < 256; i++) {
|
||||
logging(LOG_VERBOSE, "Write %d blocks of 'A' at LBA:%" PRIu64,
|
||||
i, num_blocks - i);
|
||||
memset(buf, 'A', 2 * i * block_size);
|
||||
memset(scratch, 'A', 2 * i * block_size);
|
||||
if (maximum_transfer_length && maximum_transfer_length < i) {
|
||||
break;
|
||||
}
|
||||
ret = write16(sd, num_blocks - i, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, buf,
|
||||
block_size, 0, 0, 0, 0, 0, scratch,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
@@ -138,20 +137,20 @@ test_compareandwrite_simple(void)
|
||||
"Command should fail with INVALID_FIELD_IN_CDB",
|
||||
i, maxbl);
|
||||
ret = compareandwrite(sd, 0,
|
||||
buf, 2 * i * block_size,
|
||||
scratch, 2 * i * block_size,
|
||||
block_size, 0, 0, 0, 0,
|
||||
EXPECT_INVALID_FIELD_IN_CDB);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
continue;
|
||||
}
|
||||
memset(buf + i * block_size, 'B', i * block_size);
|
||||
memset(scratch + i * block_size, 'B', i * block_size);
|
||||
|
||||
logging(LOG_VERBOSE, "Overwrite %d blocks with 'B' "
|
||||
"at LBA:%" PRIu64 " (if they all contain 'A')",
|
||||
i, num_blocks - i);
|
||||
ret = compareandwrite(sd, num_blocks - i,
|
||||
buf, 2 * i * block_size, block_size,
|
||||
scratch, 2 * i * block_size, block_size,
|
||||
0, 0, 0, 0,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
@@ -160,15 +159,15 @@ test_compareandwrite_simple(void)
|
||||
" and verify they are all 'B'",
|
||||
i, num_blocks - i);
|
||||
ret = read16(sd, NULL, num_blocks - i, i * block_size,
|
||||
block_size, 0, 0, 0, 0, 0, buf,
|
||||
block_size, 0, 0, 0, 0, 0, scratch,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
for (j = 0; j < i * block_size; j++) {
|
||||
if (buf[j] != 'B') {
|
||||
if (scratch[j] != 'B') {
|
||||
logging(LOG_VERBOSE, "[FAILED] Data did not "
|
||||
"read back as 'B' (buf[%d] = %#02x)",
|
||||
j, buf[j]);
|
||||
"read back as 'B' (scratch[%d] = %#02x)",
|
||||
j, scratch[j]);
|
||||
CU_FAIL("Block was not written correctly");
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user