[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 38/54] tests/qtest: bios-tables-test: Adapt the case for win32
From: |
Bin Meng |
Subject: |
[PATCH v3 38/54] tests/qtest: bios-tables-test: Adapt the case for win32 |
Date: |
Sun, 25 Sep 2022 19:30:16 +0800 |
From: Bin Meng <bin.meng@windriver.com>
Single quotes in the arguments (oem_id='CRASH ') are not removed in
the Windows environment before it is passed to the QEMU executable.
The space in the argument causes the "-acpitable" option parser to
think that all of its parameters are done, hence it complains:
'-acpitable' requires one of 'data' or 'file'
Change to use double quotes which works fine on all platforms.
Also /dev/null does not work on win32, and nul should be used.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
(no changes since v1)
tests/qtest/bios-tables-test.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 46a46fe0aa..2ebeb530b2 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1615,6 +1615,12 @@ static void test_acpi_virt_viot(void)
free_test_data(&data);
}
+#ifndef _WIN32
+# define DEV_NULL "/dev/null"
+#else
+# define DEV_NULL "nul"
+#endif
+
static void test_acpi_q35_slic(void)
{
test_data data = {
@@ -1622,9 +1628,9 @@ static void test_acpi_q35_slic(void)
.variant = ".slic",
};
- test_acpi_one("-acpitable sig=SLIC,oem_id='CRASH ',oem_table_id='ME',"
- "oem_rev=00002210,asl_compiler_id='qemu',"
- "asl_compiler_rev=00000000,data=/dev/null",
+ test_acpi_one("-acpitable sig=SLIC,oem_id=\"CRASH \",oem_table_id=ME,"
+ "oem_rev=00002210,asl_compiler_id=qemu,"
+ "asl_compiler_rev=00000000,data=" DEV_NULL,
&data);
free_test_data(&data);
}
--
2.34.1
- [PATCH v3 33/54] tests/qtest: Use send/recv for socket communication, (continued)
- [PATCH v3 33/54] tests/qtest: Use send/recv for socket communication, Bin Meng, 2022/09/25
- [PATCH v3 34/54] tests/qtest: libqtest: Exclude the *_fds APIs for win32, Bin Meng, 2022/09/25
- [PATCH v3 36/54] tests/qtest: Support libqtest to build and run on Windows, Bin Meng, 2022/09/25
- [PATCH v3 42/54] chardev/char-file: Add FILE_SHARE_WRITE when opening the file for win32, Bin Meng, 2022/09/25
- [PATCH v3 35/54] tests/qtest: libqtest: Install signal handler via signal(), Bin Meng, 2022/09/25
- [PATCH v3 40/54] tests/qtest: ide-test: Open file in binary mode, Bin Meng, 2022/09/25
- [PATCH v3 44/54] tests/qtest: microbit-test: Fix socket access for win32, Bin Meng, 2022/09/25
- [PATCH v3 38/54] tests/qtest: bios-tables-test: Adapt the case for win32,
Bin Meng <=
- [PATCH v3 39/54] tests/qtest: migration-test: Disable IO redirection for win32, Bin Meng, 2022/09/25
- [PATCH v3 41/54] tests/qtest: virtio-net-failover: Disable migration tests for win32, Bin Meng, 2022/09/25
- [PATCH v3 43/54] tests/qtest: migration-test: Make sure QEMU process "to" exited after migration is canceled, Bin Meng, 2022/09/25
- [PATCH v3 37/54] tests/qtest: {ahci, ide}-test: Use relative path for temporary files for win32, Bin Meng, 2022/09/25
- [PATCH v3 48/54] io/channel-watch: Drop the unnecessary cast, Bin Meng, 2022/09/25
- [PATCH v3 46/54] tests/qtest: libqtest: Correct the timeout unit of blocking receive calls for win32, Bin Meng, 2022/09/25
- [PATCH v3 49/54] io/channel-watch: Fix socket watch on Windows, Bin Meng, 2022/09/25