aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-11-14 15:01:57 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2019-11-14 15:01:57 (GMT)
commitf2bcb38fc187e617563179ad426e34c220750eb4 (patch)
tree374aa824ec621c2b2c7d37d3a92fbfd4dff8993f
parent11f990b55294a9eb8d5d4f29fa9a277702ca72b9 (diff)
Adjust tests to separate attributes with commamulti-attribute-tests
-rw-r--r--libbuild2/function+call.test.testscript2
-rw-r--r--old-tests/variable/type/buildfile10
-rw-r--r--tests/function/builtin/testscript6
3 files changed, 9 insertions, 9 deletions
diff --git a/libbuild2/function+call.test.testscript b/libbuild2/function+call.test.testscript
index 569ed80..2e50181 100644
--- a/libbuild2/function+call.test.testscript
+++ b/libbuild2/function+call.test.testscript
@@ -109,7 +109,7 @@ $* <'print $nullable(nonull)' >'false'
: null-fail
:
-$* <'$dummy1([string null])' 2>>EOE != 0
+$* <'$dummy1([string, null])' 2>>EOE != 0
error: invalid argument: null value
buildfile:1:2: info: while calling dummy1(string)
EOE
diff --git a/old-tests/variable/type/buildfile b/old-tests/variable/type/buildfile
index ef56f19..c6eab8d 100644
--- a/old-tests/variable/type/buildfile
+++ b/old-tests/variable/type/buildfile
@@ -4,7 +4,7 @@
#[string] str3 = foo
#[bool] str3 = false # error: changing str3 type from string to bool
-#[bool string] str3 = foo # error: multiple variable types: bool, string
+#[bool, string] str3 = foo # error: multiple variable types: bool, string
#[junk] jnk = foo # error: unknown variable attribute junk
@@ -21,8 +21,8 @@ print $str2
# Value typing.
#
-#v = [bool string] true # error: multiple value types: string, bool
-#v = [string=junk] true # error: unexpected value for attribute string: junk
+#v = [bool, string] true # error: multiple value types: string, bool
+#v = [string=junk] true # error: unexpected value for attribute string: junk
#[string] var =
#var = [bool] true # error: confliction variable var type string and value type bool
@@ -67,11 +67,11 @@ sub/
print $v5b # 2
}
-v6 = [uint64 null]
+v6 = [uint64, null]
v6 += 00
print $v6 # 0
-v7 = [string null]
+v7 = [string, null]
v7 += [uint64] 00
print $v7 # 0
diff --git a/tests/function/builtin/testscript b/tests/function/builtin/testscript
index 46a7b2c..4a49ac3 100644
--- a/tests/function/builtin/testscript
+++ b/tests/function/builtin/testscript
@@ -10,7 +10,7 @@
$* <'print $type([string])' >'string' : empty-typed
$* <'print $type("")' >'' : empty-untyped
- $* <'print $type([string null])' >'string' : null-typed
+ $* <'print $type([string, null])' >'string' : null-typed
$* <'print $type([null])' >'' : null-untyped
$* <'print $type([string] abc)' >'string' : value-typed
@@ -48,8 +48,8 @@
$* <'print $identity("")' >'{}';
$* <'print $type($identity(""))' >'' : empty-untyped
- $* <'print $identity([string null])' >'[null]';
- $* <'print $type($identity([string null]))' >'string' : null-typed
+ $* <'print $identity([string, null])' >'[null]';
+ $* <'print $type($identity([string, null]))' >'string' : null-typed
$* <'print $identity([null])' >'[null]';
$* <'print $type($identity([null]))' >'' : null-untyped