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

test-tool: Change command_is_implemented from a global variable into an argument

Browse Source 
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
This commit is contained in:
Bart Van Assche
2021-02-08 19:01:31 -08:00
parent c7a9f51d23
commit f87a5adaa0
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test-tool/test_write10_residuals.c
View File

@@ -90,7 +90,10 @@ test_write10_residuals(void)
iscsi_set_noautoreconnect(sd->iscsi_ctx, 1); iscsi_set_noautoreconnect(sd->iscsi_ctx, 1);
for (i = 0; i < ARRAY_SIZE(write10_residuals); i++) { for (i = 0; i < ARRAY_SIZE(write10_residuals); i++) {
write_residuals_test(&write10_residuals[i]); bool command_is_implemented;
write_residuals_test(&write10_residuals[i],
&command_is_implemented);
if (!command_is_implemented) { if (!command_is_implemented) {
CU_PASS("WRITE10 is not implemented."); CU_PASS("WRITE10 is not implemented.");

5
test-tool/test_write12_residuals.c
View File

@@ -90,7 +90,10 @@ test_write12_residuals(void)
iscsi_set_noautoreconnect(sd->iscsi_ctx, 1); iscsi_set_noautoreconnect(sd->iscsi_ctx, 1);
for (i = 0; i < ARRAY_SIZE(write12_residuals); i++) { for (i = 0; i < ARRAY_SIZE(write12_residuals); i++) {
write_residuals_test(&write12_residuals[i]); bool command_is_implemented;
write_residuals_test(&write12_residuals[i],
&command_is_implemented);
if (!command_is_implemented) { if (!command_is_implemented) {
CU_PASS("WRITE12 is not implemented."); CU_PASS("WRITE12 is not implemented.");

5
test-tool/test_write16_residuals.c
View File

@@ -90,7 +90,10 @@ test_write16_residuals(void)
iscsi_set_noautoreconnect(sd->iscsi_ctx, 1); iscsi_set_noautoreconnect(sd->iscsi_ctx, 1);
for (i = 0; i < ARRAY_SIZE(write16_residuals); i++) { for (i = 0; i < ARRAY_SIZE(write16_residuals); i++) {
write_residuals_test(&write16_residuals[i]); bool command_is_implemented;
write_residuals_test(&write16_residuals[i],
&command_is_implemented);
if (!command_is_implemented) { if (!command_is_implemented) {
CU_PASS("WRITE16 is not implemented."); CU_PASS("WRITE16 is not implemented.");

9
test-tool/test_write_residuals.c
View File

@@ -29,10 +29,9 @@
#include "iscsi-test-cu.h" #include "iscsi-test-cu.h"
#include "test_write_residuals.h" #include "test_write_residuals.h"
bool command_is_implemented = true;
void void
write_residuals_test(const struct residuals_test_data *tdata) write_residuals_test(const struct residuals_test_data *tdata,
bool *command_is_implemented)
{ {
struct iscsi_data data; struct iscsi_data data;
struct scsi_task *task_ret; struct scsi_task *task_ret;
@@ -49,6 +48,8 @@ write_residuals_test(const struct residuals_test_data *tdata)
logging(LOG_VERBOSE, "\n%s", tdata->description); logging(LOG_VERBOSE, "\n%s", tdata->description);
*command_is_implemented = true;
switch (tdata->cdb_size) { switch (tdata->cdb_size) {
case 10: case 10:
scsi_opcode_write = SCSI_OPCODE_WRITE10; scsi_opcode_write = SCSI_OPCODE_WRITE10;
@@ -122,7 +123,7 @@ write_residuals_test(const struct residuals_test_data *tdata)
task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST && task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST &&
task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
logging(LOG_NORMAL, "[SKIPPED] WRITE%zu is not implemented.", tdata->cdb_size); logging(LOG_NORMAL, "[SKIPPED] WRITE%zu is not implemented.", tdata->cdb_size);
command_is_implemented = false; *command_is_implemented = false;
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
task = NULL; task = NULL;
return; return;

4
test-tool/test_write_residuals.h
View File

@@ -45,7 +45,7 @@ struct task_status {
struct scsi_sense sense; struct scsi_sense sense;
}; };
extern bool command_is_implemented; void write_residuals_test(const struct residuals_test_data *tdata,
extern void write_residuals_test (const struct residuals_test_data *tdata); bool *command_is_implemented);
#endif /* _ISCSI_TESTS_WRITE_RESIDUALS_H_ */ #endif /* _ISCSI_TESTS_WRITE_RESIDUALS_H_ */