diff --git a/test-tool/test_prout_reserve_access.c b/test-tool/test_prout_reserve_access.c index c431064..431cddb 100644 --- a/test-tool/test_prout_reserve_access.c +++ b/test-tool/test_prout_reserve_access.c @@ -69,7 +69,7 @@ verify_persistent_reserve_access(struct scsi_device *sd1, struct scsi_device *sd CU_ASSERT_EQUAL(0, ret); read_write_buf = malloc(512); /* allocate a buffer */ - CU_ASSERT_PTR_NOT_NULL(read_write_buf); + CU_ASSERT_PTR_NOT_NULL_FATAL(read_write_buf); /* make sure init1 can read */ ret = verify_read_works(sd1, read_write_buf); diff --git a/test-tool/test_read10_invalid.c b/test-tool/test_read10_invalid.c index 65a2408..4303b9d 100644 --- a/test-tool/test_read10_invalid.c +++ b/test-tool/test_read10_invalid.c @@ -50,7 +50,7 @@ test_read10_invalid(void) /* Try a read10 of 1 block but xferlength == 0 */ task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ10; @@ -69,7 +69,7 @@ test_read10_invalid(void) logging(LOG_VERBOSE, "Try reading one block but with iSCSI expected transfer length==0"); task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */ logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); @@ -103,7 +103,7 @@ test_read10_invalid(void) logging(LOG_VERBOSE, "Try reading one block but with iSCSI expected transfer length==10000"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ10; @@ -113,7 +113,7 @@ test_read10_invalid(void) task->expxferlen = 10000; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -147,7 +147,7 @@ test_read10_invalid(void) logging(LOG_VERBOSE, "Try reading one block but with iSCSI expected transfer length==200"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ10; @@ -157,7 +157,7 @@ test_read10_invalid(void) task->expxferlen = 200; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -193,7 +193,7 @@ test_read10_invalid(void) logging(LOG_VERBOSE, "Try reading two blocks but iSCSI expected " "transfer length==%zu (==one block)", block_size); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ10; @@ -203,7 +203,7 @@ test_read10_invalid(void) task->expxferlen = block_size; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -237,7 +237,7 @@ test_read10_invalid(void) logging(LOG_VERBOSE, "Try READ10 for one block but flag it as a write on the iSCSI layer."); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ10; @@ -254,7 +254,7 @@ test_read10_invalid(void) iscsi_set_timeout(sd->iscsi_ctx, 3); task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); iscsi_set_noautoreconnect(sd->iscsi_ctx, 0); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/test_read10_residuals.c b/test-tool/test_read10_residuals.c index 64422bd..f425506 100644 --- a/test-tool/test_read10_residuals.c +++ b/test-tool/test_read10_residuals.c @@ -51,7 +51,7 @@ test_read10_residuals(void) /* Try a read10 of 1 block but xferlength == 0 */ task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ10; @@ -70,7 +70,7 @@ test_read10_residuals(void) logging(LOG_VERBOSE, "Try reading one block but with iSCSI expected transfer length==0"); task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */ logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); @@ -104,7 +104,7 @@ test_read10_residuals(void) logging(LOG_VERBOSE, "Try reading one block but with iSCSI expected transfer length==10000"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ10; @@ -114,7 +114,7 @@ test_read10_residuals(void) task->expxferlen = 10000; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -152,7 +152,7 @@ test_read10_residuals(void) logging(LOG_VERBOSE, "Try reading one block but with iSCSI expected transfer length==200"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ10; @@ -162,7 +162,7 @@ test_read10_residuals(void) task->expxferlen = 200; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -198,7 +198,7 @@ test_read10_residuals(void) logging(LOG_VERBOSE, "Try reading two blocks but iSCSI expected " "transfer length==%zu (==one block)", block_size); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ10; @@ -208,7 +208,7 @@ test_read10_residuals(void) task->expxferlen = block_size; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/test_read10_simple.c b/test-tool/test_read10_simple.c index 523b32a..20650e7 100644 --- a/test-tool/test_read10_simple.c +++ b/test-tool/test_read10_simple.c @@ -44,7 +44,6 @@ test_read10_simple(void) CU_ASSERT_EQUAL(ret, 0); } - logging(LOG_VERBOSE, "Test READ10 of 1-256 blocks at the end of the LUN"); for (i = 1; i <= 256; i++) { if (maximum_transfer_length && maximum_transfer_length < i) { diff --git a/test-tool/test_read12_residuals.c b/test-tool/test_read12_residuals.c index 4766854..b95be1d 100644 --- a/test-tool/test_read12_residuals.c +++ b/test-tool/test_read12_residuals.c @@ -46,7 +46,7 @@ test_read12_residuals(void) } task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ12; @@ -65,7 +65,7 @@ test_read12_residuals(void) logging(LOG_VERBOSE, "Try reading one block but with iSCSI expected transfer length==0"); task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */ if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -106,7 +106,7 @@ test_read12_residuals(void) logging(LOG_VERBOSE, "Try reading one block but with iSCSI expected transfer length==10000"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ12; @@ -116,7 +116,7 @@ test_read12_residuals(void) task->expxferlen = 10000; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -154,7 +154,7 @@ test_read12_residuals(void) logging(LOG_VERBOSE, "Try reading one block but with iSCSI expected transfer length==200"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ12; @@ -164,7 +164,7 @@ test_read12_residuals(void) task->expxferlen = 200; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -200,7 +200,7 @@ test_read12_residuals(void) logging(LOG_VERBOSE, "Try reading two blocks but iSCSI expected " "transfer length==%zu (==one block)", block_size); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ12; @@ -210,7 +210,7 @@ test_read12_residuals(void) task->expxferlen = block_size; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/test_read16_residuals.c b/test-tool/test_read16_residuals.c index cad13c4..b7c3f1d 100644 --- a/test-tool/test_read16_residuals.c +++ b/test-tool/test_read16_residuals.c @@ -46,7 +46,7 @@ test_read16_residuals(void) } task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ16; @@ -65,7 +65,7 @@ test_read16_residuals(void) logging(LOG_VERBOSE, "Try reading one block but with iSCSI expected transfer length==0"); task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */ if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -106,7 +106,7 @@ test_read16_residuals(void) logging(LOG_VERBOSE, "Try reading one block but with iSCSI expected transfer length==10000"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ16; @@ -116,7 +116,7 @@ test_read16_residuals(void) task->expxferlen = 10000; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -154,7 +154,7 @@ test_read16_residuals(void) logging(LOG_VERBOSE, "Try reading one block but with iSCSI expected transfer length==200"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ16; @@ -164,7 +164,7 @@ test_read16_residuals(void) task->expxferlen = 200; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -200,7 +200,7 @@ test_read16_residuals(void) logging(LOG_VERBOSE, "Try reading two blocks but iSCSI expected " "transfer length==%zu (==one block)", block_size); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_READ16; @@ -210,7 +210,7 @@ test_read16_residuals(void) task->expxferlen = block_size; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/test_sanitize_block_erase.c b/test-tool/test_sanitize_block_erase.c index 2d22f0e..23c6a77 100644 --- a/test-tool/test_sanitize_block_erase.c +++ b/test-tool/test_sanitize_block_erase.c @@ -37,7 +37,7 @@ check_wabereq(void) read10(sd, &task_ret, 0, block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); CU_ASSERT_NOT_EQUAL(task_ret->status, SCSI_STATUS_CANCELLED); switch (inq_bdc->wabereq) { diff --git a/test-tool/test_sanitize_crypto_erase.c b/test-tool/test_sanitize_crypto_erase.c index 1c99b8a..4bb7a15 100644 --- a/test-tool/test_sanitize_crypto_erase.c +++ b/test-tool/test_sanitize_crypto_erase.c @@ -37,7 +37,7 @@ check_wacereq(void) read10(sd, &task_ret, 0, block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); CU_ASSERT_NOT_EQUAL(task_ret->status, SCSI_STATUS_CANCELLED); switch (inq_bdc->wabereq) { diff --git a/test-tool/test_write10_residuals.c b/test-tool/test_write10_residuals.c index 4143d55..283c7d9 100644 --- a/test-tool/test_write10_residuals.c +++ b/test-tool/test_write10_residuals.c @@ -54,7 +54,7 @@ test_write10_residuals(void) /* Try a write10 of 1 block but xferlength == 0 */ task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE10; @@ -72,7 +72,7 @@ test_write10_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==0"); task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */ if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -113,7 +113,7 @@ test_write10_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==10000"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE10; @@ -126,7 +126,7 @@ test_write10_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -156,7 +156,7 @@ test_write10_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==200"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE10; @@ -168,7 +168,7 @@ test_write10_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); ok = task->status == SCSI_STATUS_GOOD || @@ -205,7 +205,7 @@ test_write10_residuals(void) logging(LOG_VERBOSE, "Try writing two blocks but iSCSI expected " "transfer length==%zu (==one block)", block_size); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE10; @@ -217,7 +217,7 @@ test_write10_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -258,7 +258,7 @@ test_write10_residuals(void) logging(LOG_VERBOSE, "Write one block of 'b' but set iSCSI EDTL to 2 blocks."); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(buf, 'b', 10000); @@ -272,7 +272,7 @@ test_write10_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -334,7 +334,7 @@ test_write10_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'b' but set iSCSI EDTL to 1 blocks."); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(buf, 'b', 10000); @@ -348,7 +348,7 @@ test_write10_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/test_write12_residuals.c b/test-tool/test_write12_residuals.c index c66aee2..7f68a2a 100644 --- a/test-tool/test_write12_residuals.c +++ b/test-tool/test_write12_residuals.c @@ -54,7 +54,7 @@ test_write12_residuals(void) /* Try a write12 of 1 block but xferlength == 0 */ task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE12; @@ -72,7 +72,7 @@ test_write12_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==0"); task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */ if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -113,7 +113,7 @@ test_write12_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==10000"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE12; @@ -126,7 +126,7 @@ test_write12_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -156,7 +156,7 @@ test_write12_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==200"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE12; @@ -168,7 +168,7 @@ test_write12_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); ok = task->status == SCSI_STATUS_GOOD || @@ -205,7 +205,7 @@ test_write12_residuals(void) logging(LOG_VERBOSE, "Try writing two blocks but iSCSI expected " "transfer length==%zu (==one block)", block_size); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE12; @@ -217,7 +217,7 @@ test_write12_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -257,7 +257,7 @@ test_write12_residuals(void) logging(LOG_VERBOSE, "Write one block of 'b' but set iSCSI EDTL to 2 blocks."); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(buf, 'b', 10000); @@ -271,7 +271,7 @@ test_write12_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -333,7 +333,7 @@ test_write12_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'b' but set iSCSI EDTL to 1 blocks."); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(buf, 'b', 10000); @@ -347,7 +347,7 @@ test_write12_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/test_write16_residuals.c b/test-tool/test_write16_residuals.c index 1132de8..f1c4f20 100644 --- a/test-tool/test_write16_residuals.c +++ b/test-tool/test_write16_residuals.c @@ -54,7 +54,7 @@ test_write16_residuals(void) /* Try a write16 of 1 block but xferlength == 0 */ task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE16; @@ -72,7 +72,7 @@ test_write16_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==0"); task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */ if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -113,7 +113,7 @@ test_write16_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==10000"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE16; @@ -126,7 +126,7 @@ test_write16_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -156,7 +156,7 @@ test_write16_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==200"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE16; @@ -168,7 +168,7 @@ test_write16_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); ok = task->status == SCSI_STATUS_GOOD || @@ -205,7 +205,7 @@ test_write16_residuals(void) logging(LOG_VERBOSE, "Try writing two blocks but iSCSI expected " "transfer length==%zu (==one block)", block_size); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE16; @@ -217,7 +217,7 @@ test_write16_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -257,7 +257,7 @@ test_write16_residuals(void) logging(LOG_VERBOSE, "Write one block of 'b' but set iSCSI EDTL to 2 blocks."); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(buf, 'b', 10000); @@ -271,7 +271,7 @@ test_write16_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -333,7 +333,7 @@ test_write16_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'b' but set iSCSI EDTL to 1 blocks."); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(buf, 'b', 10000); @@ -347,7 +347,7 @@ test_write16_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/test_writeverify10_residuals.c b/test-tool/test_writeverify10_residuals.c index 70be045..1229938 100644 --- a/test-tool/test_writeverify10_residuals.c +++ b/test-tool/test_writeverify10_residuals.c @@ -63,7 +63,7 @@ test_writeverify10_residuals(void) /* Try a writeverify10 of 1 block but xferlength == 0 */ task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10; @@ -81,7 +81,7 @@ test_writeverify10_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==0"); task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */ if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -122,7 +122,7 @@ test_writeverify10_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==10000"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10; @@ -135,7 +135,7 @@ test_writeverify10_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -165,7 +165,7 @@ test_writeverify10_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==200"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10; @@ -177,7 +177,7 @@ test_writeverify10_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); ok = task->status == SCSI_STATUS_GOOD || @@ -214,7 +214,7 @@ test_writeverify10_residuals(void) logging(LOG_VERBOSE, "Try writing two blocks but iSCSI expected " "transfer length==%zu (==one block)", block_size); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY10; @@ -226,7 +226,7 @@ test_writeverify10_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -267,7 +267,7 @@ test_writeverify10_residuals(void) logging(LOG_VERBOSE, "Write one block of 'b' but set iSCSI EDTL to 2 blocks."); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(buf, 'b', 10000); @@ -281,7 +281,7 @@ test_writeverify10_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -343,7 +343,7 @@ test_writeverify10_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'b' but set iSCSI EDTL to 1 blocks."); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(buf, 'b', 10000); @@ -357,7 +357,7 @@ test_writeverify10_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/test_writeverify12_residuals.c b/test-tool/test_writeverify12_residuals.c index 87aa541..b0beb61 100644 --- a/test-tool/test_writeverify12_residuals.c +++ b/test-tool/test_writeverify12_residuals.c @@ -63,7 +63,7 @@ test_writeverify12_residuals(void) /* Try a writeverify12 of 1 block but xferlength == 0 */ task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY12; @@ -81,7 +81,7 @@ test_writeverify12_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==0"); task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */ if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -122,7 +122,7 @@ test_writeverify12_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==10000"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY12; @@ -135,7 +135,7 @@ test_writeverify12_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -165,7 +165,7 @@ test_writeverify12_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==200"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY12; @@ -177,7 +177,7 @@ test_writeverify12_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); ok = task->status == SCSI_STATUS_GOOD || @@ -214,7 +214,7 @@ test_writeverify12_residuals(void) logging(LOG_VERBOSE, "Try writing two blocks but iSCSI expected " "transfer length==%zu (==one block)", block_size); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY12; @@ -226,7 +226,7 @@ test_writeverify12_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -267,7 +267,7 @@ test_writeverify12_residuals(void) logging(LOG_VERBOSE, "Write one block of 'b' but set iSCSI EDTL to 2 blocks."); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(buf, 'b', 10000); @@ -281,7 +281,7 @@ test_writeverify12_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -343,7 +343,7 @@ test_writeverify12_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'b' but set iSCSI EDTL to 1 blocks."); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(buf, 'b', 10000); @@ -357,7 +357,7 @@ test_writeverify12_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { diff --git a/test-tool/test_writeverify16_residuals.c b/test-tool/test_writeverify16_residuals.c index 60f007f..128dcab 100644 --- a/test-tool/test_writeverify16_residuals.c +++ b/test-tool/test_writeverify16_residuals.c @@ -72,7 +72,7 @@ test_writeverify16_residuals(void) /* Try a writeverify16 of 1 block but xferlength == 0 */ task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY16; @@ -90,7 +90,7 @@ test_writeverify16_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==0"); task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, NULL); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */ if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -131,7 +131,7 @@ test_writeverify16_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==10000"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY16; @@ -144,7 +144,7 @@ test_writeverify16_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -174,7 +174,7 @@ test_writeverify16_residuals(void) logging(LOG_VERBOSE, "Try writing one block but with iSCSI expected transfer length==200"); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY16; @@ -186,7 +186,7 @@ test_writeverify16_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); ok = task->status == SCSI_STATUS_GOOD || @@ -223,7 +223,7 @@ test_writeverify16_residuals(void) logging(LOG_VERBOSE, "Try writing two blocks but iSCSI expected " "transfer length==%zu (==one block)", block_size); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(task, 0, sizeof(struct scsi_task)); task->cdb[0] = SCSI_OPCODE_WRITE_VERIFY16; @@ -235,7 +235,7 @@ test_writeverify16_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -276,7 +276,7 @@ test_writeverify16_residuals(void) logging(LOG_VERBOSE, "Write one block of 'b' but set iSCSI EDTL to 2 blocks."); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(buf, 'b', 10000); @@ -290,7 +290,7 @@ test_writeverify16_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) { @@ -352,7 +352,7 @@ test_writeverify16_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'b' but set iSCSI EDTL to 1 blocks."); task = malloc(sizeof(struct scsi_task)); - CU_ASSERT_PTR_NOT_NULL(task); + CU_ASSERT_PTR_NOT_NULL_FATAL(task); memset(buf, 'b', 10000); @@ -366,7 +366,7 @@ test_writeverify16_residuals(void) data.size = task->expxferlen; data.data = &buf[0]; task_ret = iscsi_scsi_command_sync(sd->iscsi_ctx, sd->iscsi_lun, task, &data); - CU_ASSERT_PTR_NOT_NULL(task_ret); + CU_ASSERT_PTR_NOT_NULL_FATAL(task_ret); logging(LOG_VERBOSE, "Verify that the target returned SUCCESS"); if (task->status != SCSI_STATUS_GOOD) {