1 files changed, 0 insertions, 156 deletions
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
index 1c809647..2b73d51b 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
@@ -177,162 +177,6 @@
       "cmd": {
         "path": "./x86_64-cros-linux-gnu-clang",
         "args": [
-          "-Wno-error=unused-but-set-variable",
-          "main.cc"
-        ]
-      }
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/usr/bin/ccache",
-          "args": [
-            "../../usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
-            "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
-            "-static-libgcc",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
-            "-Wno-error=unused-variable",
-            "main.cc",
-            "-Wno-implicit-int-float-conversion",
-            "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
-            "-Wno-deprecated-copy",
-            "-mno-movbe",
-            "-B../../bin",
-            "-target",
-            "x86_64-cros-linux-gnu"
-          ],
-          "env_updates": [
-            "CCACHE_DIR=/var/cache/distfiles/ccache",
-            "CCACHE_UMASK=002",
-            "CCACHE_CPP2=yes"
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "wrapper": {
-      "cmd": {
-        "path": "./x86_64-cros-linux-gnu-clang",
-        "args": [
-          "-Wno-unused-but-set-variable",
-          "main.cc"
-        ]
-      }
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/usr/bin/ccache",
-          "args": [
-            "../../usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
-            "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
-            "-static-libgcc",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
-            "-Wno-unused-variable",
-            "main.cc",
-            "-Wno-implicit-int-float-conversion",
-            "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
-            "-Wno-deprecated-copy",
-            "-mno-movbe",
-            "-B../../bin",
-            "-target",
-            "x86_64-cros-linux-gnu"
-          ],
-          "env_updates": [
-            "CCACHE_DIR=/var/cache/distfiles/ccache",
-            "CCACHE_UMASK=002",
-            "CCACHE_CPP2=yes"
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "wrapper": {
-      "cmd": {
-        "path": "./x86_64-cros-linux-gnu-clang",
-        "args": [
-          "-Wunused-but-set-variable",
-          "main.cc"
-        ]
-      }
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/usr/bin/ccache",
-          "args": [
-            "../../usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
-            "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
-            "-static-libgcc",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
-            "-Wunused-variable",
-            "main.cc",
-            "-Wno-implicit-int-float-conversion",
-            "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
-            "-Wno-deprecated-copy",
-            "-mno-movbe",
-            "-B../../bin",
-            "-target",
-            "x86_64-cros-linux-gnu"
-          ],
-          "env_updates": [
-            "CCACHE_DIR=/var/cache/distfiles/ccache",
-            "CCACHE_UMASK=002",
-            "CCACHE_CPP2=yes"
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "wrapper": {
-      "cmd": {
-        "path": "./x86_64-cros-linux-gnu-clang",
-        "args": [
           "-Xclang-only=-someflag",
           "main.cc"
         ]