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

Merge pull request #244 from bvanassche/master

Browse Source 
test tool: Set BYTCHK=1 if EDTL != 0
This commit is contained in:
Ronnie Sahlberg
2017-05-03 15:31:55 -07:00
committed by GitHub
parent 383e6572d4 7c10722449
commit 86fd53581e
15 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test-tool/test_nomedia_sbc.c
View File

@@ -93,7 +93,7 @@ static void
test_writeverify10(void) test_writeverify10(void)
{ {
logging(LOG_VERBOSE, "Test WRITEVERIFY10 when medium is ejected."); logging(LOG_VERBOSE, "Test WRITEVERIFY10 when medium is ejected.");
WRITEVERIFY10(sd, 0, block_size, block_size, 0, 0, 0, 0, scratch, WRITEVERIFY10(sd, 0, block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_NO_MEDIUM); EXPECT_NO_MEDIUM);
} }
@@ -101,7 +101,7 @@ static void
test_writeverify12(void) test_writeverify12(void)
{ {
logging(LOG_VERBOSE, "Test WRITEVERIFY12 when medium is ejected."); logging(LOG_VERBOSE, "Test WRITEVERIFY12 when medium is ejected.");
WRITEVERIFY12(sd, 0, block_size, block_size, 0, 0, 0, 0, scratch, WRITEVERIFY12(sd, 0, block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_NO_MEDIUM); EXPECT_NO_MEDIUM);
} }
@@ -109,7 +109,7 @@ static void
test_writeverify16(void) test_writeverify16(void)
{ {
logging(LOG_VERBOSE, "Test WRITEVERIFY16 when medium is ejected."); logging(LOG_VERBOSE, "Test WRITEVERIFY16 when medium is ejected.");
WRITEVERIFY16(sd, 0, block_size, block_size, 0, 0, 0, 0, scratch, WRITEVERIFY16(sd, 0, block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_NO_MEDIUM); EXPECT_NO_MEDIUM);
} }

6
test-tool/test_readonly_sbc.c
View File

@@ -82,7 +82,7 @@ static void
test_writeverify10(void) test_writeverify10(void)
{ {
logging(LOG_VERBOSE, "Test WRITEVERIFY10 fails with WRITE_PROTECTED"); logging(LOG_VERBOSE, "Test WRITEVERIFY10 fails with WRITE_PROTECTED");
WRITEVERIFY10(sd, 0, block_size, block_size, 0, 0, 0, 0, scratch, WRITEVERIFY10(sd, 0, block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_WRITE_PROTECTED); EXPECT_WRITE_PROTECTED);
} }
@@ -90,7 +90,7 @@ static void
test_writeverify12(void) test_writeverify12(void)
{ {
logging(LOG_VERBOSE, "Test WRITEVERIFY12 fails with WRITE_PROTECTED"); logging(LOG_VERBOSE, "Test WRITEVERIFY12 fails with WRITE_PROTECTED");
WRITEVERIFY12(sd, 0, block_size, block_size, 0, 0, 0, 0, scratch, WRITEVERIFY12(sd, 0, block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_WRITE_PROTECTED); EXPECT_WRITE_PROTECTED);
} }
@@ -98,7 +98,7 @@ static void
test_writeverify16(void) test_writeverify16(void)
{ {
logging(LOG_VERBOSE, "Test WRITEVERIFY16 fails with WRITE_PROTECTED"); logging(LOG_VERBOSE, "Test WRITEVERIFY16 fails with WRITE_PROTECTED");
WRITEVERIFY16(sd, 0, block_size, block_size, 0, 0, 0, 0, scratch, WRITEVERIFY16(sd, 0, block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_WRITE_PROTECTED); EXPECT_WRITE_PROTECTED);
} }

8
test-tool/test_writeverify10_beyond_eol.c
View File

@@ -46,7 +46,7 @@ test_writeverify10_beyond_eol(void)
break; break;
} }
WRITEVERIFY10(sd, num_blocks + 1 - i, WRITEVERIFY10(sd, num_blocks + 1 - i,
i * block_size, block_size, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_LBA_OOB); EXPECT_LBA_OOB);
} }
@@ -56,7 +56,7 @@ test_writeverify10_beyond_eol(void)
break; break;
} }
WRITEVERIFY10(sd, 0x80000000, WRITEVERIFY10(sd, 0x80000000,
i * block_size, block_size, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_LBA_OOB); EXPECT_LBA_OOB);
} }
@@ -66,7 +66,7 @@ test_writeverify10_beyond_eol(void)
break; break;
} }
WRITEVERIFY10(sd, -1, i * block_size, WRITEVERIFY10(sd, -1, i * block_size,
block_size, 0, 0, 0, 0, scratch, block_size, 0, 0, 1, 0, scratch,
EXPECT_LBA_OOB); EXPECT_LBA_OOB);
} }
@@ -76,7 +76,7 @@ test_writeverify10_beyond_eol(void)
break; break;
} }
WRITEVERIFY10(sd, num_blocks - 1, WRITEVERIFY10(sd, num_blocks - 1,
i * block_size, block_size, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_LBA_OOB); EXPECT_LBA_OOB);
} }
} }

4
test-tool/test_writeverify10_dpo.c
View File

@@ -64,11 +64,11 @@ test_writeverify10_dpo(void)
logging(LOG_VERBOSE, "Test WRITEVERIFY10 with DPO==1"); logging(LOG_VERBOSE, "Test WRITEVERIFY10 with DPO==1");
if (dpofua) { if (dpofua) {
WRITEVERIFY10(sd, 0, block_size, WRITEVERIFY10(sd, 0, block_size,
block_size, 0, 1, 0, 0, scratch, block_size, 0, 1, 1, 0, scratch,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
} else { } else {
WRITEVERIFY10(sd, 0, block_size, WRITEVERIFY10(sd, 0, block_size,
block_size, 0, 1, 0, 0, scratch, block_size, 0, 1, 1, 0, scratch,
EXPECT_INVALID_FIELD_IN_CDB); EXPECT_INVALID_FIELD_IN_CDB);
} }

6
test-tool/test_writeverify10_residuals.c
View File

@@ -62,6 +62,7 @@ test_writeverify10_residuals(void)
memset(task, 0, sizeof(struct scsi_task)); memset(task, 0, sizeof(struct scsi_task));
task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10; task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10;
task->cdb[1] = 2; /* BYTCHK = 1 */
task->cdb[8] = 1; task->cdb[8] = 1;
task->cdb_size = 10; task->cdb_size = 10;
task->xfer_dir = SCSI_XFER_WRITE; task->xfer_dir = SCSI_XFER_WRITE;
@@ -121,6 +122,7 @@ test_writeverify10_residuals(void)
memset(task, 0, sizeof(struct scsi_task)); memset(task, 0, sizeof(struct scsi_task));
task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10; task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10;
task->cdb[1] = 2; /* BYTCHK = 1 */
task->cdb[8] = 1; task->cdb[8] = 1;
task->cdb_size = 10; task->cdb_size = 10;
task->xfer_dir = SCSI_XFER_WRITE; task->xfer_dir = SCSI_XFER_WRITE;
@@ -164,6 +166,7 @@ test_writeverify10_residuals(void)
memset(task, 0, sizeof(struct scsi_task)); memset(task, 0, sizeof(struct scsi_task));
task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10; task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10;
task->cdb[1] = 2; /* BYTCHK = 1 */
task->cdb[8] = 1; task->cdb[8] = 1;
task->cdb_size = 10; task->cdb_size = 10;
task->xfer_dir = SCSI_XFER_WRITE; task->xfer_dir = SCSI_XFER_WRITE;
@@ -213,6 +216,7 @@ test_writeverify10_residuals(void)
memset(task, 0, sizeof(struct scsi_task)); memset(task, 0, sizeof(struct scsi_task));
task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10; task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10;
task->cdb[1] = 2; /* BYTCHK = 1 */
task->cdb[8] = 2; task->cdb[8] = 2;
task->cdb_size = 10; task->cdb_size = 10;
task->xfer_dir = SCSI_XFER_WRITE; task->xfer_dir = SCSI_XFER_WRITE;
@@ -266,6 +270,7 @@ test_writeverify10_residuals(void)
memset(task, 0, sizeof(struct scsi_task)); memset(task, 0, sizeof(struct scsi_task));
task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10; task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10;
task->cdb[1] = 2; /* BYTCHK = 1 */
task->cdb[8] = 1; task->cdb[8] = 1;
task->cdb_size = 10; task->cdb_size = 10;
task->xfer_dir = SCSI_XFER_WRITE; task->xfer_dir = SCSI_XFER_WRITE;
@@ -338,6 +343,7 @@ test_writeverify10_residuals(void)
memset(task, 0, sizeof(struct scsi_task)); memset(task, 0, sizeof(struct scsi_task));
task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10; task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10;
task->cdb[1] = 2; /* BYTCHK = 1 */
task->cdb[8] = 2; task->cdb[8] = 2;
task->cdb_size = 10; task->cdb_size = 10;
task->xfer_dir = SCSI_XFER_WRITE; task->xfer_dir = SCSI_XFER_WRITE;

4
test-tool/test_writeverify10_simple.c
View File

@@ -42,7 +42,7 @@ test_writeverify10_simple(void)
break; break;
} }
WRITEVERIFY10(sd, 0, i * block_size, WRITEVERIFY10(sd, 0, i * block_size,
block_size, 0, 0, 0, 0, scratch, block_size, 0, 0, 1, 0, scratch,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
} }
@@ -52,7 +52,7 @@ test_writeverify10_simple(void)
break; break;
} }
WRITEVERIFY10(sd, num_blocks - i, WRITEVERIFY10(sd, num_blocks - i,
i * block_size, block_size, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
} }
} }

2
test-tool/test_writeverify10_wrprotect.c
View File

@@ -46,7 +46,7 @@ test_writeverify10_wrprotect(void)
logging(LOG_VERBOSE, "Device does not support/use protection information. All commands should fail."); logging(LOG_VERBOSE, "Device does not support/use protection information. All commands should fail.");
for (i = 1; i < 8; i++) { for (i = 1; i < 8; i++) {
WRITEVERIFY10(sd, 0, block_size, block_size, WRITEVERIFY10(sd, 0, block_size, block_size,
i, 0, 0, 0, scratch, i, 0, 1, 0, scratch,
EXPECT_INVALID_FIELD_IN_CDB); EXPECT_INVALID_FIELD_IN_CDB);
} }
return; return;

8
test-tool/test_writeverify12_beyond_eol.c
View File

@@ -46,7 +46,7 @@ test_writeverify12_beyond_eol(void)
break; break;
} }
WRITEVERIFY12(sd, num_blocks + 1 - i, WRITEVERIFY12(sd, num_blocks + 1 - i,
i * block_size, block_size, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_LBA_OOB); EXPECT_LBA_OOB);
} }
@@ -56,7 +56,7 @@ test_writeverify12_beyond_eol(void)
break; break;
} }
WRITEVERIFY12(sd, 0x80000000, WRITEVERIFY12(sd, 0x80000000,
i * block_size, block_size, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_LBA_OOB); EXPECT_LBA_OOB);
} }
@@ -66,7 +66,7 @@ test_writeverify12_beyond_eol(void)
break; break;
} }
WRITEVERIFY12(sd, -1, i * block_size, WRITEVERIFY12(sd, -1, i * block_size,
block_size, 0, 0, 0, 0, scratch, block_size, 0, 0, 1, 0, scratch,
EXPECT_LBA_OOB); EXPECT_LBA_OOB);
} }
@@ -76,7 +76,7 @@ test_writeverify12_beyond_eol(void)
break; break;
} }
WRITEVERIFY12(sd, num_blocks - 1, WRITEVERIFY12(sd, num_blocks - 1,
i * block_size, block_size, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_LBA_OOB); EXPECT_LBA_OOB);
} }
} }

4
test-tool/test_writeverify12_dpo.c
View File

@@ -64,11 +64,11 @@ test_writeverify12_dpo(void)
logging(LOG_VERBOSE, "Test WRITEVERIFY12 with DPO==1"); logging(LOG_VERBOSE, "Test WRITEVERIFY12 with DPO==1");
if (dpofua) { if (dpofua) {
WRITEVERIFY12(sd, 0, block_size, WRITEVERIFY12(sd, 0, block_size,
block_size, 0, 1, 0, 0, scratch, block_size, 0, 1, 1, 0, scratch,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
} else { } else {
WRITEVERIFY12(sd, 0, block_size, WRITEVERIFY12(sd, 0, block_size,
block_size, 0, 1, 0, 0, scratch, block_size, 0, 1, 1, 0, scratch,
EXPECT_INVALID_FIELD_IN_CDB); EXPECT_INVALID_FIELD_IN_CDB);
} }

4
test-tool/test_writeverify12_simple.c
View File

@@ -42,7 +42,7 @@ test_writeverify12_simple(void)
break; break;
} }
WRITEVERIFY12(sd, 0, i * block_size, WRITEVERIFY12(sd, 0, i * block_size,
block_size, 0, 0, 0, 0, scratch, block_size, 0, 0, 1, 0, scratch,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
} }
@@ -52,7 +52,7 @@ test_writeverify12_simple(void)
break; break;
} }
WRITEVERIFY12(sd, num_blocks - i, WRITEVERIFY12(sd, num_blocks - i,
i * block_size, block_size, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
} }
} }

2
test-tool/test_writeverify12_wrprotect.c
View File

@@ -46,7 +46,7 @@ test_writeverify12_wrprotect(void)
logging(LOG_VERBOSE, "Device does not support/use protection information. All commands should fail."); logging(LOG_VERBOSE, "Device does not support/use protection information. All commands should fail.");
for (i = 1; i < 8; i++) { for (i = 1; i < 8; i++) {
WRITEVERIFY12(sd, 0, block_size, block_size, WRITEVERIFY12(sd, 0, block_size, block_size,
i, 0, 0, 0, scratch, i, 0, 1, 0, scratch,
EXPECT_INVALID_FIELD_IN_CDB); EXPECT_INVALID_FIELD_IN_CDB);
} }
return; return;

8
test-tool/test_writeverify16_beyond_eol.c
View File

@@ -42,7 +42,7 @@ test_writeverify16_beyond_eol(void)
break; break;
} }
WRITEVERIFY16(sd, num_blocks + 1 - i, WRITEVERIFY16(sd, num_blocks + 1 - i,
i * block_size, block_size, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_LBA_OOB); EXPECT_LBA_OOB);
} }
@@ -52,7 +52,7 @@ test_writeverify16_beyond_eol(void)
break; break;
} }
WRITEVERIFY16(sd, 0x8000000000000000ULL, WRITEVERIFY16(sd, 0x8000000000000000ULL,
i * block_size, block_size, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_LBA_OOB); EXPECT_LBA_OOB);
} }
@@ -62,7 +62,7 @@ test_writeverify16_beyond_eol(void)
break; break;
} }
WRITEVERIFY16(sd, -1, WRITEVERIFY16(sd, -1,
i * block_size, block_size, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_LBA_OOB); EXPECT_LBA_OOB);
} }
@@ -72,7 +72,7 @@ test_writeverify16_beyond_eol(void)
break; break;
} }
WRITEVERIFY16(sd, num_blocks - 1, WRITEVERIFY16(sd, num_blocks - 1,
i * block_size, block_size, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_LBA_OOB); EXPECT_LBA_OOB);
} }
} }

4
test-tool/test_writeverify16_dpo.c
View File

@@ -65,11 +65,11 @@ test_writeverify16_dpo(void)
memset(scratch, 0xa6, block_size); memset(scratch, 0xa6, block_size);
if (dpofua) { if (dpofua) {
WRITEVERIFY16(sd, 0, block_size, WRITEVERIFY16(sd, 0, block_size,
block_size, 0, 1, 0, 0, scratch, block_size, 0, 1, 1, 0, scratch,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
} else { } else {
WRITEVERIFY16(sd, 0, block_size, WRITEVERIFY16(sd, 0, block_size,
block_size, 0, 1, 0, 0, scratch, block_size, 0, 1, 1, 0, scratch,
EXPECT_INVALID_FIELD_IN_CDB); EXPECT_INVALID_FIELD_IN_CDB);
} }

2
test-tool/test_writeverify16_residuals.c
View File

@@ -53,7 +53,7 @@ test_writeverify16_residuals(void)
} }
/* check if writeverify16 is supported */ /* check if writeverify16 is supported */
WRITEVERIFY16(sd, 0, 0, block_size, 0, 0, 0, 0, NULL, WRITEVERIFY16(sd, 0, 0, block_size, 0, 0, 1, 0, NULL,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
if (sd->iscsi_ctx == NULL) { if (sd->iscsi_ctx == NULL) {

4
test-tool/test_writeverify16_simple.c
View File

@@ -43,7 +43,7 @@ test_writeverify16_simple(void)
break; break;
} }
WRITEVERIFY16(sd, 0, i * block_size, WRITEVERIFY16(sd, 0, i * block_size,
block_size, 0, 0, 0, 0, scratch, block_size, 0, 0, 1, 0, scratch,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
} }
@@ -53,7 +53,7 @@ test_writeverify16_simple(void)
break; break;
} }
WRITEVERIFY16(sd, num_blocks - i, WRITEVERIFY16(sd, num_blocks - i,
i * block_size, block_size, 0, 0, 0, 0, scratch, i * block_size, block_size, 0, 0, 1, 0, scratch,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
} }
} }