From dc2d141b21179e9e2cedff175d247bfa6f9d776f Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 26 May 2025 10:22:17 +0200
Subject: options: print option name before "as_root()" in errors

Starting with Meson 1.8.0, "meson configure" prints some options as
":foo" instead of "foo".  Print the option as it was passed by the
user.

While at it, make errors more consistent and/or correct (e.g.
"Unknown option" instead of "Unknown options").

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 test cases/common/247 deprecated option/test.json | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'test cases/common')

diff --git a/test cases/common/247 deprecated option/test.json b/test cases/common/247 deprecated option/test.json
index a644b0405..4b9a4750a 100644
--- a/test cases/common/247 deprecated option/test.json	
+++ b/test cases/common/247 deprecated option/test.json	
@@ -26,77 +26,77 @@
   },
   "stdout": [
     {
-      "line": ".*DEPRECATION: Option 'o1' is deprecated",
+      "line": ".*DEPRECATION: Option \"o1\" is deprecated",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'o2' value 'a' is deprecated",
+      "line": ".*DEPRECATION: Option \"o2\" value 'a' is deprecated",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'o3' value 'a' is replaced by 'c'",
+      "line": ".*DEPRECATION: Option \"o3\" value 'a' is replaced by 'c'",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'o4' value 'true' is replaced by 'enabled'",
+      "line": ".*DEPRECATION: Option \"o4\" value 'true' is replaced by 'enabled'",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'o5' value 'auto' is replaced by 'false'",
+      "line": ".*DEPRECATION: Option \"o5\" value 'auto' is replaced by 'false'",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'p1' is deprecated",
+      "line": ".*DEPRECATION: Option \"p1\" is deprecated",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'p2' value 'a' is deprecated",
+      "line": ".*DEPRECATION: Option \"p2\" value 'a' is deprecated",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'p3' value 'a' is replaced by 'c'",
+      "line": ".*DEPRECATION: Option \"p3\" value 'a' is replaced by 'c'",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'p4' value 'true' is replaced by 'enabled'",
+      "line": ".*DEPRECATION: Option \"p4\" value 'true' is replaced by 'enabled'",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'p5' value 'auto' is replaced by 'false'",
+      "line": ".*DEPRECATION: Option \"p5\" value 'auto' is replaced by 'false'",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'c1' is deprecated",
+      "line": ".*DEPRECATION: Option \"c1\" is deprecated",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'c2' value 'a' is deprecated",
+      "line": ".*DEPRECATION: Option \"c2\" value 'a' is deprecated",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'c3' value 'a' is replaced by 'c'",
+      "line": ".*DEPRECATION: Option \"c3\" value 'a' is replaced by 'c'",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'c4' value 'true' is replaced by 'enabled'",
+      "line": ".*DEPRECATION: Option \"c4\" value 'true' is replaced by 'enabled'",
       "match": "re",
       "count": 1
     },
     {
-      "line": ".*DEPRECATION: Option 'c5' value 'auto' is replaced by 'false'",
+      "line": ".*DEPRECATION: Option \"c5\" value 'auto' is replaced by 'false'",
       "match": "re",
       "count": 1
     }
-- 
cgit v1.2.3