OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/qtest: {ahci, ide}-test: Use relative path for temporary files for win32 

These test cases uses "blkdebug:path/to/config:path/to/image" for
testing. On Windows, absolute file paths contain the delimiter ':'
which causes the blkdebug filename parser fail to parse filenames.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220925113032.1949844-38-bmeng.cn@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Bin Meng 2022-09-25 19:30:15 +08:00 committed by Thomas Huth
parent 490081b282
commit be181f87eb
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/qtest/ahci-test.c
View File

@ -1833,7 +1833,7 @@ static void create_ahci_io_test(enum IOMode type, enum AddrMode addr,
int main(int argc, char **argv)
{
const char *arch;
const char *arch, *base;
int ret;
int fd;
int c;
@ -1871,8 +1871,22 @@ int main(int argc, char **argv)
return 0;
}
/*
* "base" stores the starting point where we create temporary files.
*
* On Windows, this is set to the relative path of current working
* directory, because the absolute path causes the blkdebug filename
* parser fail to parse "blkdebug:path/to/config:path/to/image".
*/
#ifndef _WIN32
base = g_get_tmp_dir();
#else
base = ".";
#endif
/* Create a temporary image */
fd = g_file_open_tmp("qtest.XXXXXX", &tmp_path, NULL);
tmp_path = g_strdup_printf("%s/qtest.XXXXXX", base);
fd = g_mkstemp(tmp_path);
g_assert(fd >= 0);
if (have_qemu_img()) {
imgfmt = "qcow2";
@ -1889,7 +1903,8 @@ int main(int argc, char **argv)
close(fd);
/* Create temporary blkdebug instructions */
fd = g_file_open_tmp("qtest-blkdebug.XXXXXX", &debug_path, NULL);
debug_path = g_strdup_printf("%s/qtest-blkdebug.XXXXXX", base);
fd = g_mkstemp(debug_path);
g_assert(fd >= 0);
close(fd);

20
tests/qtest/ide-test.c
View File

@ -1011,16 +1011,32 @@ static void test_cdrom_dma(void)
int main(int argc, char **argv)
{
const char *base;
int fd;
int ret;
/*
* "base" stores the starting point where we create temporary files.
*
* On Windows, this is set to the relative path of current working
* directory, because the absolute path causes the blkdebug filename
* parser fail to parse "blkdebug:path/to/config:path/to/image".
*/
#ifndef _WIN32
base = g_get_tmp_dir();
#else
base = ".";
#endif
/* Create temporary blkdebug instructions */
fd = g_file_open_tmp("qtest-blkdebug.XXXXXX", &debug_path, NULL);
debug_path = g_strdup_printf("%s/qtest-blkdebug.XXXXXX", base);
fd = g_mkstemp(debug_path);
g_assert(fd >= 0);
close(fd);
/* Create a temporary raw image */
fd = g_file_open_tmp("qtest.XXXXXX", &tmp_path, NULL);
tmp_path = g_strdup_printf("%s/qtest.XXXXXX", base);
fd = g_mkstemp(tmp_path);
g_assert(fd >= 0);
ret = ftruncate(fd, TEST_IMAGE_SIZE);
g_assert(ret == 0);