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

TESTS: Remove some tests that wont work yet for /dev/sg

Browse Source 
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2014-09-19 17:15:48 -07:00
parent 59817c7959
commit 1e3cc445c8
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test-tool/iscsi-support.c
+4 -12
View File
@@ -1920,8 +1920,8 @@ int
unmap(struct scsi_device *sdev, int anchor, struct unmap_list *list, int list_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq) unmap(struct scsi_device *sdev, int anchor, struct unmap_list *list, int list_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq)
{ {
struct scsi_task *task; struct scsi_task *task;
struct scsi_iovec *iov;
unsigned char *data; unsigned char *data;
struct iscsi_data d;
int xferlen; int xferlen;
int i; int i;
int ret; int ret;
@@ -1956,18 +1956,10 @@ unmap(struct scsi_device *sdev, int anchor, struct unmap_list *list, int list_le
scsi_set_uint32(&data[8 + 16 * i + 8], list[i].num); scsi_set_uint32(&data[8 + 16 * i + 8], list[i].num);
} }
iov = scsi_malloc(task, sizeof(struct scsi_iovec)); d.data = data;
if (iov == NULL) { d.size = xferlen;
logging(LOG_NORMAL, "Out-of-memory: Failed to create "
"iov array.");
scsi_free_scsi_task(task);
return -1;
}
iov->iov_base = data;
iov->iov_len = xferlen;
scsi_task_set_iov_out(task, iov, 1);
task = send_scsi_command(sdev, task, NULL); task = send_scsi_command(sdev, task, &d);
ret = check_result("UNMAP", sdev, task, status, key, ascq, num_ascq); ret = check_result("UNMAP", sdev, task, status, key, ascq, num_ascq);
if (task) { if (task) {
test-tool/iscsi-test-cu.c
-7
View File
@@ -547,15 +547,9 @@ static libiscsi_suite_info linux_suites[] = {
{ "GetLBAStatus", NON_PGR_FUNCS, tests_get_lba_status }, { "GetLBAStatus", NON_PGR_FUNCS, tests_get_lba_status },
{ "Inquiry", NON_PGR_FUNCS, tests_inquiry }, { "Inquiry", NON_PGR_FUNCS, tests_inquiry },
{ "Mandatory", NON_PGR_FUNCS, tests_mandatory }, { "Mandatory", NON_PGR_FUNCS, tests_mandatory },
{ "ModeSense6", NON_PGR_FUNCS, tests_modesense6 },
{ "OrWrite", NON_PGR_FUNCS, tests_orwrite }, { "OrWrite", NON_PGR_FUNCS, tests_orwrite },
{ "Prefetch10", NON_PGR_FUNCS, tests_prefetch10 }, { "Prefetch10", NON_PGR_FUNCS, tests_prefetch10 },
{ "Prefetch16", NON_PGR_FUNCS, tests_prefetch16 }, { "Prefetch16", NON_PGR_FUNCS, tests_prefetch16 },
{ "PrinReadKeys", NON_PGR_FUNCS, tests_prin_read_keys },
{ "PrinServiceactionRange", NON_PGR_FUNCS,
tests_prin_serviceaction_range },
{ "ProutRegister", NON_PGR_FUNCS, tests_prout_register },
{ "ProutReserve", NON_PGR_FUNCS, tests_prout_reserve },
{ "Read6", NON_PGR_FUNCS, tests_read6 }, { "Read6", NON_PGR_FUNCS, tests_read6 },
{ "Read10", NON_PGR_FUNCS, tests_read10 }, { "Read10", NON_PGR_FUNCS, tests_read10 },
{ "Read12", NON_PGR_FUNCS, tests_read12 }, { "Read12", NON_PGR_FUNCS, tests_read12 },
@@ -565,7 +559,6 @@ static libiscsi_suite_info linux_suites[] = {
{ "ReadOnly", NON_PGR_FUNCS, tests_readonly }, { "ReadOnly", NON_PGR_FUNCS, tests_readonly },
{ "ReportSupportedOpcodes", NON_PGR_FUNCS, { "ReportSupportedOpcodes", NON_PGR_FUNCS,
tests_report_supported_opcodes }, tests_report_supported_opcodes },
{ "Reserve6", NON_PGR_FUNCS, tests_reserve6 },
{ "TestUnitReady", NON_PGR_FUNCS, tests_testunitready }, { "TestUnitReady", NON_PGR_FUNCS, tests_testunitready },
{ "Unmap", NON_PGR_FUNCS, tests_unmap }, { "Unmap", NON_PGR_FUNCS, tests_unmap },
{ "Verify10", NON_PGR_FUNCS, tests_verify10 }, { "Verify10", NON_PGR_FUNCS, tests_verify10 },