[Qemu-devel] [PULL 0/2]: QMP queue

[Qemu-devel] [PULL 0/2]: QMP queue

[Luiz Capitulino]

Anthony,

The following patches have been sent to the list and look good to me. I've
also tested them.

The changes (since 344eecf6995f4a0ad1d887cec922f6806f91a3f8) are available
in the following repository:

    git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

Jan Kiszka (1):
      Fix qjson test of solidus encoding

Luiz Capitulino (1):
      configure: Copy test data to build directory

 check-qjson.c |    3 ++-
 configure     |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

[Qemu-devel] [PATCH 1/2] configure: Copy test data to build directory

[Luiz Capitulino]

The QDict unit-tests (check-qdict) will fail when ran on a different
build directory. That's, it only works when ran on the source dir.

This happens because its data file (qdict-test-data.txt) is not
copied to the build dir. Fix it.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index c3044c7..fe3147b 100755
--- a/configure
+++ b/configure
@@ -3614,7 +3614,7 @@ DIRS="$DIRS roms/seabios roms/vgabios"
 DIRS="$DIRS fsdev ui"
 DIRS="$DIRS qapi"
 DIRS="$DIRS qga trace"
-FILES="Makefile tests/Makefile"
+FILES="Makefile tests/Makefile qdict-test-data.txt"
 FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
 FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
 FILES="$FILES pc-bios/spapr-rtas/Makefile"
-- 
1.7.7.rc0.72.g4b5ea

[Qemu-devel] [PATCH 2/2] Fix qjson test of solidus encoding

[Luiz Capitulino]

From: Jan Kiszka <jan.kiszka@siemens.com>

"\/" is supposed to be decoded as "/", but there is no need to encode
"/" via escape. Fix the existing test and add a second one expressing
this.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 check-qjson.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/check-qjson.c b/check-qjson.c
index 64fcdcb..36d4ac2 100644
--- a/check-qjson.c
+++ b/check-qjson.c
@@ -33,7 +33,8 @@ START_TEST(escaped_string)
         { "\"\\n\"", "\n" },
         { "\"\\r\"", "\r" },
         { "\"\\t\"", "\t" },
-        { "\"\\/\"", "\\/" },
+        { "\"/\"", "/" },
+        { "\"\\/\"", "/", .skip = 1 },
         { "\"\\\\\"", "\\" },
         { "\"\\\"\"", "\"" },
         { "\"hello world \\\"embedded string\\\"\"",
-- 
1.7.7.rc0.72.g4b5ea

Re: [Qemu-devel] [PULL 0/2]: QMP queue

[Anthony Liguori]

On 09/06/2011 11:44 AM, Luiz Capitulino wrote:
> Anthony,
>
> The following patches have been sent to the list and look good to me. I've
> also tested them.


Pulled.  Thanks.

Regards,

Anthony Liguori

>
> The changes (since 344eecf6995f4a0ad1d887cec922f6806f91a3f8) are available
> in the following repository:
>
>      git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>
> Jan Kiszka (1):
>        Fix qjson test of solidus encoding
>
> Luiz Capitulino (1):
>        configure: Copy test data to build directory
>
>   check-qjson.c |    3 ++-
>   configure     |    2 +-
>   2 files changed, 3 insertions(+), 2 deletions(-)
>
>
>