diff mbox series

[45/51] tests/qtest: prom-env-test: Use double quotes to pass the prom-env option

Message ID 20220824094029.1634519-46-bmeng.cn@gmail.com (mailing list archive)
State New, archived
Headers show
Series tests/qtest: Enable running qtest on Windows | expand

Commit Message

Bin Meng Aug. 24, 2022, 9:40 a.m. UTC
From: Bin Meng <bin.meng@windriver.com>

Single quotes like -prom-env 'nvramrc=cafec0de 4000 l!' in the arguments
are not removed in the Windows environment before it is passed to the
QEMU executable. Such argument causes a failure in the QEMU prom-env
option parser codes.

Change to use double quotes which works fine on all platforms.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
---

 tests/qtest/prom-env-test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Thomas Huth Aug. 25, 2022, 12:33 p.m. UTC | #1
On 24/08/2022 11.40, Bin Meng wrote:
> From: Bin Meng <bin.meng@windriver.com>
> 
> Single quotes like -prom-env 'nvramrc=cafec0de 4000 l!' in the arguments
> are not removed in the Windows environment before it is passed to the
> QEMU executable. Such argument causes a failure in the QEMU prom-env
> option parser codes.
> 
> Change to use double quotes which works fine on all platforms.
> 
> Signed-off-by: Bin Meng <bin.meng@windriver.com>
> ---
> 
>   tests/qtest/prom-env-test.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/qtest/prom-env-test.c b/tests/qtest/prom-env-test.c
> index c2b0448e55..39ccb59797 100644
> --- a/tests/qtest/prom-env-test.c
> +++ b/tests/qtest/prom-env-test.c
> @@ -58,8 +58,8 @@ static void test_machine(const void *machine)
>               " -machine " PSERIES_DEFAULT_CAPABILITIES;
>       }
>   
> -    qts = qtest_initf("-M %s -accel tcg %s -prom-env 'use-nvramrc?=true' "
> -                      "-prom-env 'nvramrc=%x %x l!' ", (const char *)machine,
> +    qts = qtest_initf("-M %s -accel tcg %s -prom-env \"use-nvramrc?=true\" "
> +                      "-prom-env \"nvramrc=%x %x l!\" ", (const char *)machine,
>                         extra_args, MAGIC, ADDRESS);
>       check_guest_memory(qts);
>       qtest_quit(qts);

Reviewed-by: Thomas Huth <thuth@redhat.com>
diff mbox series

Patch

diff --git a/tests/qtest/prom-env-test.c b/tests/qtest/prom-env-test.c
index c2b0448e55..39ccb59797 100644
--- a/tests/qtest/prom-env-test.c
+++ b/tests/qtest/prom-env-test.c
@@ -58,8 +58,8 @@  static void test_machine(const void *machine)
             " -machine " PSERIES_DEFAULT_CAPABILITIES;
     }
 
-    qts = qtest_initf("-M %s -accel tcg %s -prom-env 'use-nvramrc?=true' "
-                      "-prom-env 'nvramrc=%x %x l!' ", (const char *)machine,
+    qts = qtest_initf("-M %s -accel tcg %s -prom-env \"use-nvramrc?=true\" "
+                      "-prom-env \"nvramrc=%x %x l!\" ", (const char *)machine,
                       extra_args, MAGIC, ADDRESS);
     check_guest_memory(qts);
     qtest_quit(qts);