diff options
Diffstat (limited to 'tests/basic')
| -rw-r--r-- | tests/basic/13.in | 2 | ||||
| -rw-r--r-- | tests/basic/15.in | 24 | ||||
| -rw-r--r-- | tests/basic/15.inc | 3 | ||||
| -rw-r--r-- | tests/basic/15.res | 7 | ||||
| -rw-r--r-- | tests/basic/16.in | 12 | ||||
| -rw-r--r-- | tests/basic/16.inc | 3 | ||||
| -rw-r--r-- | tests/basic/16.res | 7 | ||||
| -rw-r--r-- | tests/basic/17.in | 2 | ||||
| -rw-r--r-- | tests/basic/17.res | 2 | ||||
| -rw-r--r-- | tests/basic/18.in | 10 | ||||
| -rw-r--r-- | tests/basic/18.res | 11 | ||||
| -rw-r--r-- | tests/basic/19-append.inc | 8 | ||||
| -rw-r--r-- | tests/basic/19-merge.inc | 8 | ||||
| -rw-r--r-- | tests/basic/19-rewrite.inc | 8 | ||||
| -rw-r--r-- | tests/basic/19.in | 28 | ||||
| -rw-r--r-- | tests/basic/19.res | 36 | ||||
| -rw-r--r-- | tests/basic/20.in | 2 | ||||
| -rw-r--r-- | tests/basic/20.res | 5 | ||||
| -rw-r--r-- | tests/basic/21.in | 2 | ||||
| -rw-r--r-- | tests/basic/21.res | 10 | ||||
| -rw-r--r-- | tests/basic/22.in | 2 | ||||
| -rw-r--r-- | tests/basic/22.res | 2 |
22 files changed, 193 insertions, 1 deletions
diff --git a/tests/basic/13.in b/tests/basic/13.in index 81f03a61d286..6e31e9c4b17f 100644 --- a/tests/basic/13.in +++ b/tests/basic/13.in @@ -1,7 +1,7 @@ key = value_orig; # test glob -.include(glob=true) "${CURDIR}/include_dir/test*.conf" +.include(glob=true,something="test") "${CURDIR}/include_dir/test*.conf" .include(priority=1) "${CURDIR}/include_dir/pri1.conf" .include(priority=2) "${CURDIR}/include_dir/pri2.conf" diff --git a/tests/basic/15.in b/tests/basic/15.in new file mode 100644 index 000000000000..1329b8c7c130 --- /dev/null +++ b/tests/basic/15.in @@ -0,0 +1,24 @@ +# In this test we test include override bug + +.include(priority = 1) "${CURDIR}/15.inc" + +section = { + value = "test"; +} + +overrided = { + value = "not-to-be-shown"; +} + +/* + BUGGED UCL: + overrided { + key = "overrided"; + } + !!! So overrided has actually rewritten the previous key + section { + value { + value = "not-to-be-shown"; + } + } +*/ diff --git a/tests/basic/15.inc b/tests/basic/15.inc new file mode 100644 index 000000000000..a9ab027351e6 --- /dev/null +++ b/tests/basic/15.inc @@ -0,0 +1,3 @@ +overrided { + key = "overrided"; +} diff --git a/tests/basic/15.res b/tests/basic/15.res new file mode 100644 index 000000000000..b6b4e2656d6d --- /dev/null +++ b/tests/basic/15.res @@ -0,0 +1,7 @@ +overrided { + key = "overrided"; +} +section { + value = "test"; +} + diff --git a/tests/basic/16.in b/tests/basic/16.in new file mode 100644 index 000000000000..07122528a32e --- /dev/null +++ b/tests/basic/16.in @@ -0,0 +1,12 @@ +.include(priority = 1) "${CURDIR}/16.inc" + +section = { + value = "test"; +} + +overrided = { + value = "not-to-be-shown"; +} +overrided = { + value2 = "implicit-array"; +} diff --git a/tests/basic/16.inc b/tests/basic/16.inc new file mode 100644 index 000000000000..34b6085c3fac --- /dev/null +++ b/tests/basic/16.inc @@ -0,0 +1,3 @@ +overrided { + key = "overrided"; +} diff --git a/tests/basic/16.res b/tests/basic/16.res new file mode 100644 index 000000000000..b6b4e2656d6d --- /dev/null +++ b/tests/basic/16.res @@ -0,0 +1,7 @@ +overrided { + key = "overrided"; +} +section { + value = "test"; +} + diff --git a/tests/basic/17.in b/tests/basic/17.in new file mode 100644 index 000000000000..bae66fb32eca --- /dev/null +++ b/tests/basic/17.in @@ -0,0 +1,2 @@ +# issue 74 +string that ends in slash\
\ No newline at end of file diff --git a/tests/basic/17.res b/tests/basic/17.res new file mode 100644 index 000000000000..9870b04035a9 --- /dev/null +++ b/tests/basic/17.res @@ -0,0 +1,2 @@ +string = "that ends in slash\\"; + diff --git a/tests/basic/18.in b/tests/basic/18.in new file mode 100644 index 000000000000..bd12c019859a --- /dev/null +++ b/tests/basic/18.in @@ -0,0 +1,10 @@ +defaults { + key = "val" + foo = "bar" + many = "values here" +} + +mything { + .inherit "defaults" + key = "newval" +} diff --git a/tests/basic/18.res b/tests/basic/18.res new file mode 100644 index 000000000000..a6272d508ac5 --- /dev/null +++ b/tests/basic/18.res @@ -0,0 +1,11 @@ +defaults { + key = "val"; + foo = "bar"; + many = "values here"; +} +mything { + key = "newval"; + foo = "bar"; + many = "values here"; +} + diff --git a/tests/basic/19-append.inc b/tests/basic/19-append.inc new file mode 100644 index 000000000000..909dfceb951c --- /dev/null +++ b/tests/basic/19-append.inc @@ -0,0 +1,8 @@ +okey_append = { + key = value1; + key1 = value2 +} + +akey_append = ["value3"]; + +skey_append = "value4"; diff --git a/tests/basic/19-merge.inc b/tests/basic/19-merge.inc new file mode 100644 index 000000000000..46deccbf7254 --- /dev/null +++ b/tests/basic/19-merge.inc @@ -0,0 +1,8 @@ +okey_merge = { + key = value1; + key1 = value2; +} + +akey_merge = ["value3"]; + +skey_merge = "value4"; diff --git a/tests/basic/19-rewrite.inc b/tests/basic/19-rewrite.inc new file mode 100644 index 000000000000..5a7094b0592d --- /dev/null +++ b/tests/basic/19-rewrite.inc @@ -0,0 +1,8 @@ +okey_rewrite = { + key = value1; + key1 = value2; +} + +akey_rewrite = ["value3"]; + +skey_rewrite = "value4"; diff --git a/tests/basic/19.in b/tests/basic/19.in new file mode 100644 index 000000000000..717aed819262 --- /dev/null +++ b/tests/basic/19.in @@ -0,0 +1,28 @@ +okey_append = { + key = value; +} + +akey_append = ["value"]; + +skey_append = "value"; + +okey_merge = { + key = value; + source = original; +} + +akey_merge = ["value"]; + +skey_merge = "value"; + +okey_rewrite = { + key = value; +} + +akey_rewrite = ["value"]; + +skey_rewrite = "value"; + +.include(duplicate="append") "${CURDIR}/19-append.inc" +.include(duplicate="merge") "${CURDIR}/19-merge.inc" +.include(duplicate="rewrite") "${CURDIR}/19-rewrite.inc" diff --git a/tests/basic/19.res b/tests/basic/19.res new file mode 100644 index 000000000000..ca7bc4106115 --- /dev/null +++ b/tests/basic/19.res @@ -0,0 +1,36 @@ +okey_append { + key = "value"; +} +okey_append { + key = "value1"; + key1 = "value2"; +} +akey_append [ + "value", +] +akey_append [ + "value3", +] +skey_append = "value"; +skey_append = "value4"; +okey_merge { + key = "value"; + key = "value1"; + source = "original"; + key1 = "value2"; +} +akey_merge [ + "value", + "value3", +] +skey_merge = "value"; +skey_merge = "value4"; +okey_rewrite { + key = "value1"; + key1 = "value2"; +} +akey_rewrite [ + "value3", +] +skey_rewrite = "value4"; + diff --git a/tests/basic/20.in b/tests/basic/20.in new file mode 100644 index 000000000000..f9d4088fc20c --- /dev/null +++ b/tests/basic/20.in @@ -0,0 +1,2 @@ +# issue 112 +[[0
\ No newline at end of file diff --git a/tests/basic/20.res b/tests/basic/20.res new file mode 100644 index 000000000000..abfbbf02cfe6 --- /dev/null +++ b/tests/basic/20.res @@ -0,0 +1,5 @@ +[ + [ + 0, + ] +] diff --git a/tests/basic/21.in b/tests/basic/21.in new file mode 100644 index 000000000000..8f4b328548bb --- /dev/null +++ b/tests/basic/21.in @@ -0,0 +1,2 @@ + [9 +{0 [[0
\ No newline at end of file diff --git a/tests/basic/21.res b/tests/basic/21.res new file mode 100644 index 000000000000..db091ce39354 --- /dev/null +++ b/tests/basic/21.res @@ -0,0 +1,10 @@ +[ + 9, + { + 0 [ + [ + 0, + ] + ] + } +] diff --git a/tests/basic/22.in b/tests/basic/22.in new file mode 100644 index 000000000000..244cea0b0c73 --- /dev/null +++ b/tests/basic/22.in @@ -0,0 +1,2 @@ +# issue 113 +ÿ=1
\ No newline at end of file diff --git a/tests/basic/22.res b/tests/basic/22.res new file mode 100644 index 000000000000..d4bf94d896a1 --- /dev/null +++ b/tests/basic/22.res @@ -0,0 +1,2 @@ +ÿ = 1; + |