Merge branch 'develop' into feature/cmake_cleanup

nlohmann · Dec 28, 2016 · 400ebdd · 400ebdd
2 parents 4a50610 + 888f5b9
commit 400ebdd
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 21 deletions.
diff --git a/...,sig:06,src:000223+000677,op:splice,rep:2 → test/data/cbor_regression/test01 b/...,sig:06,src:000223+000677,op:splice,rep:2 → test/data/cbor_regression/test01
diff --git a/...d:000000,sig:06,src:000787,op:havoc,rep:8 → test/data/cbor_regression/test02 b/...d:000000,sig:06,src:000787,op:havoc,rep:8 → test/data/cbor_regression/test02
diff --git a/...:000000,sig:06,src:000833,op:havoc,rep:32 → test/data/cbor_regression/test03 b/...:000000,sig:06,src:000833,op:havoc,rep:32 → test/data/cbor_regression/test03
diff --git a/...:000000,sig:06,src:000838,op:havoc,rep:64 → test/data/cbor_regression/test04 b/...:000000,sig:06,src:000838,op:havoc,rep:64 → test/data/cbor_regression/test04
diff --git a/...sig:06,src:000846+001064,op:splice,rep:16 → test/data/cbor_regression/test05 b/...sig:06,src:000846+001064,op:splice,rep:16 → test/data/cbor_regression/test05
diff --git a/...d:000000,sig:06,src:000848,op:flip1,pos:0 → test/data/cbor_regression/test06 b/...d:000000,sig:06,src:000848,op:flip1,pos:0 → test/data/cbor_regression/test06
diff --git a/...:000000,sig:06,src:001435,op:havoc,rep:32 → test/data/cbor_regression/test07 b/...:000000,sig:06,src:001435,op:havoc,rep:32 → test/data/cbor_regression/test07
diff --git a/...d:000000,sig:06,src:001436,op:havoc,rep:4 → test/data/cbor_regression/test08 b/...d:000000,sig:06,src:001436,op:havoc,rep:4 → test/data/cbor_regression/test08
diff --git a/...,sig:06,src:000864+000903,op:splice,rep:2 → test/data/cbor_regression/test09 b/...,sig:06,src:000864+000903,op:splice,rep:2 → test/data/cbor_regression/test09
diff --git a/...sig:06,src:001310+001138,op:splice,rep:32 → test/data/cbor_regression/test10 b/...sig:06,src:001310+001138,op:splice,rep:32 → test/data/cbor_regression/test10
diff --git a/...sig:06,src:001330+000569,op:splice,rep:64 → test/data/cbor_regression/test11 b/...sig:06,src:001330+000569,op:splice,rep:64 → test/data/cbor_regression/test11
diff --git a/...:000001,sig:06,src:001413,op:havoc,rep:32 → test/data/cbor_regression/test12 b/...:000001,sig:06,src:001413,op:havoc,rep:32 → test/data/cbor_regression/test12
diff --git a/...d:000001,sig:06,src:001447,op:havoc,rep:4 → test/data/cbor_regression/test13 b/...d:000001,sig:06,src:001447,op:havoc,rep:4 → test/data/cbor_regression/test13
diff --git a/...,sig:06,src:001465+000325,op:splice,rep:4 → test/data/cbor_regression/test14 b/...,sig:06,src:001465+000325,op:splice,rep:4 → test/data/cbor_regression/test14
diff --git a/...d:000002,sig:06,src:000539,op:havoc,rep:8 → test/data/cbor_regression/test15 b/...d:000002,sig:06,src:000539,op:havoc,rep:8 → test/data/cbor_regression/test15
diff --git a/...000004,sig:06,src:001445,op:havoc,rep:128 → test/data/cbor_regression/test16 b/...000004,sig:06,src:001445,op:havoc,rep:128 → test/data/cbor_regression/test16
diff --git a/...:000002,sig:06,src:001301,op:havoc,rep:16 → test/data/cbor_regression/test17 b/...:000002,sig:06,src:001301,op:havoc,rep:16 → test/data/cbor_regression/test17
diff --git a/...,sig:06,src:001317+000850,op:splice,rep:8 → test/data/cbor_regression/test18 b/...,sig:06,src:001317+000850,op:splice,rep:8 → test/data/cbor_regression/test18
diff --git a/...000002,sig:06,src:001382,op:havoc,rep:128 → test/data/cbor_regression/test19 b/...000002,sig:06,src:001382,op:havoc,rep:128 → test/data/cbor_regression/test19
diff --git a/...,sig:06,src:001413+001036,op:splice,rep:4 → test/data/cbor_regression/test20 b/...,sig:06,src:001413+001036,op:splice,rep:4 → test/data/cbor_regression/test20
diff --git a/...sig:06,src:000846+000155,op:splice,rep:16 → test/data/cbor_regression/test21 b/...sig:06,src:000846+000155,op:splice,rep:16 → test/data/cbor_regression/test21
diff --git a/test/src/unit-cbor.cpp b/test/src/unit-cbor.cpp
@@ -1197,27 +1197,27 @@ TEST_CASE("CBOR regressions")
         */
         for (std::string filename :
                 {
-                    "test/data/cbor_regression/id:000000,sig:06,src:000223+000677,op:splice,rep:2",
-                    "test/data/cbor_regression/id:000000,sig:06,src:000787,op:havoc,rep:8",
-                    "test/data/cbor_regression/id:000000,sig:06,src:000833,op:havoc,rep:32",
-                    "test/data/cbor_regression/id:000000,sig:06,src:000838,op:havoc,rep:64",
-                    "test/data/cbor_regression/id:000000,sig:06,src:000846+001064,op:splice,rep:16",
-                    "test/data/cbor_regression/id:000000,sig:06,src:000848,op:flip1,pos:0",
-                    "test/data/cbor_regression/id:000000,sig:06,src:001435,op:havoc,rep:32",
-                    "test/data/cbor_regression/id:000000,sig:06,src:001436,op:havoc,rep:4v",
-                    "test/data/cbor_regression/id:000001,sig:06,src:000864+000903,op:splice,rep:2",
-                    "test/data/cbor_regression/id:000001,sig:06,src:001310+001138,op:splice,rep:32",
-                    "test/data/cbor_regression/id:000001,sig:06,src:001330+000569,op:splice,rep:64",
-                    "test/data/cbor_regression/id:000001,sig:06,src:001413,op:havoc,rep:32",
-                    "test/data/cbor_regression/id:000001,sig:06,src:001447,op:havoc,rep:4",
-                    "test/data/cbor_regression/id:000001,sig:06,src:001465+000325,op:splice,rep:4",
-                    "test/data/cbor_regression/id:000002,sig:06,src:000539,op:havoc,rep:8",
-                    "test/data/cbor_regression/id:000002,sig:06,src:001301,op:havoc,rep:16",
-                    "test/data/cbor_regression/id:000002,sig:06,src:001317+000850,op:splice,rep:8",
-                    "test/data/cbor_regression/id:000002,sig:06,src:001382,op:havoc,rep:128",
-                    "test/data/cbor_regression/id:000002,sig:06,src:001413+001036,op:splice,rep:4",
-                    "test/data/cbor_regression/id:000003,sig:06,src:000846+000155,op:splice,rep:16",
-                    "test/data/cbor_regression/id:000004,sig:06,src:001445,op:havoc,rep:128"
+                    "test/data/cbor_regression/test01",
+                    "test/data/cbor_regression/test02",
+                    "test/data/cbor_regression/test03",
+                    "test/data/cbor_regression/test04",
+                    "test/data/cbor_regression/test05",
+                    "test/data/cbor_regression/test06",
+                    "test/data/cbor_regression/test07",
+                    "test/data/cbor_regression/test08",
+                    "test/data/cbor_regression/test09",
+                    "test/data/cbor_regression/test10",
+                    "test/data/cbor_regression/test11",
+                    "test/data/cbor_regression/test12",
+                    "test/data/cbor_regression/test13",
+                    "test/data/cbor_regression/test14",
+                    "test/data/cbor_regression/test15",
+                    "test/data/cbor_regression/test16",
+                    "test/data/cbor_regression/test17",
+                    "test/data/cbor_regression/test18",
+                    "test/data/cbor_regression/test19",
+                    "test/data/cbor_regression/test20",
+                    "test/data/cbor_regression/test21"
                 })
         {
             CAPTURE(filename);