aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorCharles Brunet <charles.brunet@optelgroup.com>2024-01-11 15:20:44 -0500
committerDylan Baker <dylan@pnwbakers.com>2024-03-15 09:23:46 -0700
commitdacb25db101e7ede60b6ba3dd5a7d1935dc5ff73 (patch)
treeeef37958f0c54683829453d03d4e13bf5e02377f /test cases
parentd08ef2c08bb0120f0ba20dbc10575b7e15577349 (diff)
downloadmeson-dacb25db101e7ede60b6ba3dd5a7d1935dc5ff73.zip
meson-dacb25db101e7ede60b6ba3dd5a7d1935dc5ff73.tar.gz
meson-dacb25db101e7ede60b6ba3dd5a7d1935dc5ff73.tar.bz2
Improve error messages for invalid option values
By adding the option name to UserOption object, it is now possible to display the name of the affected option when the given option value is not valid. Fixes #12635
Diffstat (limited to 'test cases')
-rw-r--r--test cases/failing/98 number in combo/test.json2
-rw-r--r--test cases/failing/99 bool in combo/test.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/test cases/failing/98 number in combo/test.json b/test cases/failing/98 number in combo/test.json
index ecac667..c1c9484 100644
--- a/test cases/failing/98 number in combo/test.json
+++ b/test cases/failing/98 number in combo/test.json
@@ -1,5 +1,5 @@
{
"stdout": [
- { "line": "test cases/failing/98 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): \"plain\", \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
+ { "line": "test cases/failing/98 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for option \"optimization\" is not one of the choices. Possible choices are (as string): \"plain\", \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
]
}
diff --git a/test cases/failing/99 bool in combo/test.json b/test cases/failing/99 bool in combo/test.json
index 364dde8..b3effc7 100644
--- a/test cases/failing/99 bool in combo/test.json
+++ b/test cases/failing/99 bool in combo/test.json
@@ -1,5 +1,5 @@
{
"stdout": [
- { "line": "test cases/failing/99 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\"." }
+ { "line": "test cases/failing/99 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." }
]
}