1 files changed, 8 insertions, 16 deletions
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
index 0111275e..e85c065f 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
@@ -20,8 +20,6 @@
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-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",
@@ -34,6 +32,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-section",
@@ -55,8 +54,6 @@
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-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",
@@ -69,6 +66,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-section",
@@ -119,8 +117,6 @@
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-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",
@@ -133,6 +129,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-section",
@@ -155,8 +152,6 @@
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-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",
@@ -169,6 +164,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-section",
@@ -220,8 +216,6 @@
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-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",
@@ -234,6 +228,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-section",
@@ -259,8 +254,6 @@
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-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",
@@ -273,6 +266,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-section",
@@ -326,8 +320,6 @@
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-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",
@@ -340,6 +332,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-section",
@@ -362,8 +355,6 @@
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-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",
@@ -376,6 +367,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-section",