From 3c319408d0de2d2de0c19b24e1a41c0a0e4a823b Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 22 Mar 2021 15:07:18 +0100
Subject: libucl: import latest snapshot from 2021-03-14

---
 tests/basic/13.in      |  2 +-
 tests/basic/20.in      |  2 --
 tests/basic/20.res     |  5 -----
 tests/basic/21.in      |  2 --
 tests/basic/21.res     | 10 ----------
 tests/basic/9.in       |  2 +-
 tests/basic/9.res      |  8 +++++---
 tests/basic/squote.in  |  8 ++++++++
 tests/basic/squote.res |  7 +++++++
 9 files changed, 22 insertions(+), 24 deletions(-)
 delete mode 100644 tests/basic/20.in
 delete mode 100644 tests/basic/20.res
 delete mode 100644 tests/basic/21.in
 delete mode 100644 tests/basic/21.res
 create mode 100644 tests/basic/squote.in
 create mode 100644 tests/basic/squote.res

(limited to 'tests/basic')

diff --git a/tests/basic/13.in b/tests/basic/13.in
index 6e31e9c4b17f..7c464996d404 100644
--- a/tests/basic/13.in
+++ b/tests/basic/13.in
@@ -6,4 +6,4 @@ key = value_orig;
 .include(priority=1) "${CURDIR}/include_dir/pri1.conf"
 .include(priority=2) "${CURDIR}/include_dir/pri2.conf"
 
-.include(try=true) "${CURDIR}/include_dir/invalid.conf"
+# No longer valid! .include(try=true) "${CURDIR}/include_dir/invalid.conf"
diff --git a/tests/basic/20.in b/tests/basic/20.in
deleted file mode 100644
index f9d4088fc20c..000000000000
--- a/tests/basic/20.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# issue 112
-[[0
\ No newline at end of file
diff --git a/tests/basic/20.res b/tests/basic/20.res
deleted file mode 100644
index abfbbf02cfe6..000000000000
--- a/tests/basic/20.res
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-    [
-        0,
-    ]
-]
diff --git a/tests/basic/21.in b/tests/basic/21.in
deleted file mode 100644
index 8f4b328548bb..000000000000
--- a/tests/basic/21.in
+++ /dev/null
@@ -1,2 +0,0 @@
- [9
-{0 [[0
\ No newline at end of file
diff --git a/tests/basic/21.res b/tests/basic/21.res
deleted file mode 100644
index db091ce39354..000000000000
--- a/tests/basic/21.res
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-    9,
-    {
-        0 [
-            [
-                0,
-            ]
-        ]
-    }
-]
diff --git a/tests/basic/9.in b/tests/basic/9.in
index 2341445edbf0..630ee9a15d75 100644
--- a/tests/basic/9.in
+++ b/tests/basic/9.in
@@ -16,8 +16,8 @@ array = [10]
 array1 = [10]
 .include(prefix=true; key="prefix") "$CURDIR/9.inc"
 .include(prefix=true; key="prefix2"; target="array"; glob=true) "$CURDIR/9.inc"
+.include(prefix=true; key="prefix3"; target="array"; glob=true) "$CURDIR/9.inc"
 .include(prefix=true; key="prefix1"; target="array"; glob=true) "$CURDIR/9.inc"
 .include(prefix=true; key="array"; target="array"; glob=true) "$CURDIR/9.inc"
-.include(prefix=true; key="array1"; glob=true) "$CURDIR/9.inc"
 .include(prefix=true; key="prefix"; glob=true) "$CURDIR/9.inc"
 .try_include "/non/existent"
diff --git a/tests/basic/9.res b/tests/basic/9.res
index 0ed36e84422a..a4eccc8692b4 100644
--- a/tests/basic/9.res
+++ b/tests/basic/9.res
@@ -18,9 +18,6 @@ array [
 ]
 array1 [
     10,
-    {
-        key1 = "value";
-    }
 ]
 prefix {
     key1 = "value";
@@ -31,4 +28,9 @@ prefix2 [
         key1 = "value";
     }
 ]
+prefix3 [
+    {
+        key1 = "value";
+    }
+]
 
diff --git a/tests/basic/squote.in b/tests/basic/squote.in
new file mode 100644
index 000000000000..2ee9d25d8122
--- /dev/null
+++ b/tests/basic/squote.in
@@ -0,0 +1,8 @@
+a = 'b';
+b = 'b\n\'a'
+c = ''
+d = '\
+aaa';
+e = '"';
+f = '\0\e\\\\\\\\\
+\'';
diff --git a/tests/basic/squote.res b/tests/basic/squote.res
new file mode 100644
index 000000000000..a595269567bd
--- /dev/null
+++ b/tests/basic/squote.res
@@ -0,0 +1,7 @@
+a = 'b';
+b = 'b\n\'a';
+c = '';
+d = 'aaa';
+e = '"';
+f = '\0\e\\\\\\\\\'';
+
-- 
cgit v1.3