eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-12 19:30:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add dmsetup remove retry to api test.

Browse Source
This commit is contained in:
Milan Broz
2017-06-27 14:08:44 +02:00
parent b16fbde032
commit 86f327d0f5
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tests/api-test.c
View File

@@ -324,28 +324,33 @@ static int _system(const char *command, int warn)
return r; return r;
} }
#if HAVE_DECL_DM_TASK_RETRY_REMOVE
#define DM_RETRY "--retry "
#else
#deinfe DM_RETRY ""
#endif
static void _cleanup_dmdevices(void) static void _cleanup_dmdevices(void)
{ {
struct stat st; struct stat st;
if (!stat(DMDIR H_DEVICE, &st)) { if (!stat(DMDIR H_DEVICE, &st))
_system("dmsetup remove " H_DEVICE, 0); _system("dmsetup remove " DM_RETRY H_DEVICE, 0);
}
if (!stat(DMDIR H_DEVICE_WRONG, &st)) { if (!stat(DMDIR H_DEVICE_WRONG, &st))
_system("dmsetup remove " H_DEVICE_WRONG, 0); _system("dmsetup remove " DM_RETRY H_DEVICE_WRONG, 0);
}
if (!stat(DMDIR L_DEVICE_0S, &st)) { if (!stat(DMDIR L_DEVICE_0S, &st))
_system("dmsetup remove " L_DEVICE_0S, 0); _system("dmsetup remove " DM_RETRY L_DEVICE_0S, 0);
}
if (!stat(DMDIR L_DEVICE_1S, &st)) { if (!stat(DMDIR L_DEVICE_1S, &st))
_system("dmsetup remove " L_DEVICE_1S, 0); _system("dmsetup remove " DM_RETRY L_DEVICE_1S, 0);
}
if (!stat(DMDIR L_DEVICE_WRONG, &st)) { if (!stat(DMDIR L_DEVICE_WRONG, &st))
_system("dmsetup remove " L_DEVICE_WRONG, 0); _system("dmsetup remove " DM_RETRY L_DEVICE_WRONG, 0);
}
if (!stat(DMDIR L_DEVICE_OK, &st)) { if (!stat(DMDIR L_DEVICE_OK, &st))
_system("dmsetup remove " L_DEVICE_OK, 0); _system("dmsetup remove " DM_RETRY L_DEVICE_OK, 0);
}
t_dev_offset = 0; t_dev_offset = 0;
} }
@@ -357,16 +362,16 @@ static void _cleanup(void)
//_system("udevadm settle", 0); //_system("udevadm settle", 0);
if (!stat(DMDIR CDEVICE_1, &st)) if (!stat(DMDIR CDEVICE_1, &st))
_system("dmsetup remove " CDEVICE_1, 0); _system("dmsetup remove " DM_RETRY CDEVICE_1, 0);
if (!stat(DMDIR CDEVICE_2, &st)) if (!stat(DMDIR CDEVICE_2, &st))
_system("dmsetup remove " CDEVICE_2, 0); _system("dmsetup remove " DM_RETRY CDEVICE_2, 0);
if (!stat(DEVICE_EMPTY, &st)) if (!stat(DEVICE_EMPTY, &st))
_system("dmsetup remove " DEVICE_EMPTY_name, 0); _system("dmsetup remove " DM_RETRY DEVICE_EMPTY_name, 0);
if (!stat(DEVICE_ERROR, &st)) if (!stat(DEVICE_ERROR, &st))
_system("dmsetup remove " DEVICE_ERROR_name, 0); _system("dmsetup remove " DM_RETRY DEVICE_ERROR_name, 0);
_cleanup_dmdevices(); _cleanup_dmdevices();