1 files changed, 8 insertions, 16 deletions
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
index 07fd941d..cc3269ce 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
@@ -19,8 +19,6 @@
             "-resource-dir=someResourceDir",
             "-Qunused-arguments",
             "-Werror=poison-system-directories",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-builtins",
             "-Wno-deprecated-declarations",
             "-Wno-enum-constexpr-conversion",
             "-Wno-error=implicit-function-declaration",
@@ -33,6 +31,7 @@
             "-fdebug-default-version=5",
             "-Wno-int-conversion",
             "-Wno-incompatible-function-pointer-types",
+            "-Wno-error=vla-cxx-extension",
             "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
             "-fclang-abi-compat=17",
             "-Wno-unused-local-typedefs",
@@ -48,8 +47,6 @@
           "args": [
             "-Qunused-arguments",
             "-Werror=poison-system-directories",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-builtins",
             "-Wno-deprecated-declarations",
             "-Wno-enum-constexpr-conversion",
             "-Wno-error=implicit-function-declaration",
@@ -62,6 +59,7 @@
             "-fdebug-default-version=5",
             "-Wno-int-conversion",
             "-Wno-incompatible-function-pointer-types",
+            "-Wno-error=vla-cxx-extension",
             "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
             "-fclang-abi-compat=17",
             "-Wno-unused-local-typedefs",
@@ -106,8 +104,6 @@
             "-resource-dir=someResourceDir",
             "-Qunused-arguments",
             "-Werror=poison-system-directories",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-builtins",
             "-Wno-deprecated-declarations",
             "-Wno-enum-constexpr-conversion",
             "-Wno-error=implicit-function-declaration",
@@ -120,6 +116,7 @@
             "-fdebug-default-version=5",
             "-Wno-int-conversion",
             "-Wno-incompatible-function-pointer-types",
+            "-Wno-error=vla-cxx-extension",
             "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
             "-fclang-abi-compat=17",
             "-Wno-unused-local-typedefs",
@@ -136,8 +133,6 @@
             "/tmp/stable/clang",
             "-Qunused-arguments",
             "-Werror=poison-system-directories",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-builtins",
             "-Wno-deprecated-declarations",
             "-Wno-enum-constexpr-conversion",
             "-Wno-error=implicit-function-declaration",
@@ -150,6 +145,7 @@
             "-fdebug-default-version=5",
             "-Wno-int-conversion",
             "-Wno-incompatible-function-pointer-types",
+            "-Wno-error=vla-cxx-extension",
             "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
             "-fclang-abi-compat=17",
             "-Wno-unused-local-typedefs",
@@ -195,8 +191,6 @@
             "-resource-dir=someResourceDir",
             "-Qunused-arguments",
             "-Werror=poison-system-directories",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-builtins",
             "-Wno-deprecated-declarations",
             "-Wno-enum-constexpr-conversion",
             "-Wno-error=implicit-function-declaration",
@@ -209,6 +203,7 @@
             "-fdebug-default-version=5",
             "-Wno-int-conversion",
             "-Wno-incompatible-function-pointer-types",
+            "-Wno-error=vla-cxx-extension",
             "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
             "-fclang-abi-compat=17",
             "-Wno-unused-local-typedefs",
@@ -228,8 +223,6 @@
             "/tmp/stable/clang",
             "-Qunused-arguments",
             "-Werror=poison-system-directories",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-builtins",
             "-Wno-deprecated-declarations",
             "-Wno-enum-constexpr-conversion",
             "-Wno-error=implicit-function-declaration",
@@ -242,6 +235,7 @@
             "-fdebug-default-version=5",
             "-Wno-int-conversion",
             "-Wno-incompatible-function-pointer-types",
+            "-Wno-error=vla-cxx-extension",
             "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
             "-fclang-abi-compat=17",
             "-Wno-unused-local-typedefs",
@@ -289,8 +283,6 @@
             "-resource-dir=someResourceDir",
             "-Qunused-arguments",
             "-Werror=poison-system-directories",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-builtins",
             "-Wno-deprecated-declarations",
             "-Wno-enum-constexpr-conversion",
             "-Wno-error=implicit-function-declaration",
@@ -303,6 +295,7 @@
             "-fdebug-default-version=5",
             "-Wno-int-conversion",
             "-Wno-incompatible-function-pointer-types",
+            "-Wno-error=vla-cxx-extension",
             "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
             "-fclang-abi-compat=17",
             "-Wno-unused-local-typedefs",
@@ -319,8 +312,6 @@
             "/tmp/stable/clang",
             "-Qunused-arguments",
             "-Werror=poison-system-directories",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-builtins",
             "-Wno-deprecated-declarations",
             "-Wno-enum-constexpr-conversion",
             "-Wno-error=implicit-function-declaration",
@@ -333,6 +324,7 @@
             "-fdebug-default-version=5",
             "-Wno-int-conversion",
             "-Wno-incompatible-function-pointer-types",
+            "-Wno-error=vla-cxx-extension",
             "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
             "-fclang-abi-compat=17",
             "-Wno-unused-local-typedefs",