diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-08 09:07:13 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-08 09:07:13 -0500 |
| commit | 13baae8aff88dc6b0268a6078b6916eb951e316f (patch) | |
| tree | ec8ae74506a340153bb947892ac443b54e924f56 | |
| parent | 220724ca4ada4e30bcfff326b62822a69c23e181 (diff) | |
| parent | 69faeee12aee8f54870dbea78d9d1e98e30bd773 (diff) | |
| download | focaccia-qemu-13baae8aff88dc6b0268a6078b6916eb951e316f.tar.gz focaccia-qemu-13baae8aff88dc6b0268a6078b6916eb951e316f.zip | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
| -rw-r--r-- | check-qjson.c | 3 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/check-qjson.c b/check-qjson.c index 64fcdcb4ad..36d4ac26b4 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\\\"\"", diff --git a/configure b/configure index c3044c7435..fe3147b289 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" |