summary refs log tree commit diff stats
path: root/check-qjson.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-09-08 09:07:13 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-09-08 09:07:13 -0500
commit13baae8aff88dc6b0268a6078b6916eb951e316f (patch)
treeec8ae74506a340153bb947892ac443b54e924f56 /check-qjson.c
parent220724ca4ada4e30bcfff326b62822a69c23e181 (diff)
parent69faeee12aee8f54870dbea78d9d1e98e30bd773 (diff)
downloadfocaccia-qemu-13baae8aff88dc6b0268a6078b6916eb951e316f.tar.gz
focaccia-qemu-13baae8aff88dc6b0268a6078b6916eb951e316f.zip
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Diffstat (limited to 'check-qjson.c')
-rw-r--r--check-qjson.c3
1 files changed, 2 insertions, 1 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\\\"\"",