aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--check-qjson.c3
-rwxr-xr-xconfigure2
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"