aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-06-16 11:11:15 -0700
committerDylan Baker <dylan@pnwbakers.com>2020-08-01 22:00:06 -0700
commit17c8193615e5fafbbfcf99b1d028f5da36d79cc4 (patch)
tree19f01d3c08945f1f69f83cbacfa4fe729317f9c0 /test cases
parentbbba6a7f365f8b7dc7f2d4c3ce7f3e5f4c05fc5e (diff)
downloadmeson-17c8193615e5fafbbfcf99b1d028f5da36d79cc4.zip
meson-17c8193615e5fafbbfcf99b1d028f5da36d79cc4.tar.gz
meson-17c8193615e5fafbbfcf99b1d028f5da36d79cc4.tar.bz2
machine-files: give better error messages about using integers
Diffstat (limited to 'test cases')
-rw-r--r--test cases/failing/106 number in combo/meson.build1
-rw-r--r--test cases/failing/106 number in combo/nativefile.ini2
-rw-r--r--test cases/failing/106 number in combo/test.json5
-rw-r--r--test cases/failing/107 bool in combo/meson.build1
-rw-r--r--test cases/failing/107 bool in combo/meson_options.txt5
-rw-r--r--test cases/failing/107 bool in combo/nativefile.ini2
-rw-r--r--test cases/failing/107 bool in combo/test.json5
7 files changed, 21 insertions, 0 deletions
diff --git a/test cases/failing/106 number in combo/meson.build b/test cases/failing/106 number in combo/meson.build
new file mode 100644
index 0000000..1a647df
--- /dev/null
+++ b/test cases/failing/106 number in combo/meson.build
@@ -0,0 +1 @@
+project('number in combo')
diff --git a/test cases/failing/106 number in combo/nativefile.ini b/test cases/failing/106 number in combo/nativefile.ini
new file mode 100644
index 0000000..55f10fc
--- /dev/null
+++ b/test cases/failing/106 number in combo/nativefile.ini
@@ -0,0 +1,2 @@
+[built-in options]
+optimization = 1
diff --git a/test cases/failing/106 number in combo/test.json b/test cases/failing/106 number in combo/test.json
new file mode 100644
index 0000000..a32c358
--- /dev/null
+++ b/test cases/failing/106 number in combo/test.json
@@ -0,0 +1,5 @@
+{
+ "stdout": [
+ { "line": "test cases/failing/106 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
+ ]
+}
diff --git a/test cases/failing/107 bool in combo/meson.build b/test cases/failing/107 bool in combo/meson.build
new file mode 100644
index 0000000..c5efd67
--- /dev/null
+++ b/test cases/failing/107 bool in combo/meson.build
@@ -0,0 +1 @@
+project('bool in combo')
diff --git a/test cases/failing/107 bool in combo/meson_options.txt b/test cases/failing/107 bool in combo/meson_options.txt
new file mode 100644
index 0000000..0c8f5de
--- /dev/null
+++ b/test cases/failing/107 bool in combo/meson_options.txt
@@ -0,0 +1,5 @@
+option(
+ 'opt',
+ type : 'combo',
+ choices : ['true', 'false']
+)
diff --git a/test cases/failing/107 bool in combo/nativefile.ini b/test cases/failing/107 bool in combo/nativefile.ini
new file mode 100644
index 0000000..b423957
--- /dev/null
+++ b/test cases/failing/107 bool in combo/nativefile.ini
@@ -0,0 +1,2 @@
+[project options]
+opt = true
diff --git a/test cases/failing/107 bool in combo/test.json b/test cases/failing/107 bool in combo/test.json
new file mode 100644
index 0000000..37218e8
--- /dev/null
+++ b/test cases/failing/107 bool in combo/test.json
@@ -0,0 +1,5 @@
+{
+ "stdout": [
+ { "line": "test cases/failing/107 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." }
+ ]
+}