1 files changed, 40 insertions, 4 deletions
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json
index e3b5772a..92a261ce 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json
@@ -108,7 +108,7 @@
     "wd": "/tmp/stable",
     "wrapper": {
       "cmd": {
-        "path": "a/b/c/d/e/f/g/x86_64-cros-linux-gnu-gcc",
+        "path": "./a/b/c/d/e/f/g/x86_64-cros-linux-gnu-gcc",
         "args": [
           "main.cc"
         ]
@@ -119,7 +119,7 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "a/b/c/d/e/f/g/x86_64-cros-linux-gnu-gcc.real",
+            "./a/b/c/d/e/f/g/x86_64-cros-linux-gnu-gcc.real",
             "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
             "-Wno-maybe-uninitialized",
             "-Wno-unused-local-typedefs",
@@ -141,7 +141,7 @@
     "wd": "/tmp/stable",
     "wrapper": {
       "cmd": {
-        "path": "symlinked/x86_64-cros-linux-gnu-gcc",
+        "path": "./symlinked/x86_64-cros-linux-gnu-gcc",
         "args": [
           "main.cc"
         ]
@@ -152,7 +152,7 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "symlinked/x86_64-cros-linux-gnu-gcc.real",
+            "./symlinked/x86_64-cros-linux-gnu-gcc.real",
             "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
             "-Wno-maybe-uninitialized",
             "-Wno-unused-local-typedefs",
@@ -169,5 +169,41 @@
         }
       }
     ]
+  },
+  {
+    "wd": "/tmp/stable",
+    "env": [
+      "PATH=/tmp/stable/pathenv"
+    ],
+    "wrapper": {
+      "cmd": {
+        "path": "x86_64-cros-linux-gnu-gcc",
+        "args": [
+          "main.cc"
+        ]
+      }
+    },
+    "cmds": [
+      {
+        "cmd": {
+          "path": "/usr/bin/ccache",
+          "args": [
+            "/tmp/stable/pathenv/x86_64-cros-linux-gnu-gcc.real",
+            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "-Wno-maybe-uninitialized",
+            "-Wno-unused-local-typedefs",
+            "-Wno-deprecated-declarations",
+            "-Wtrampolines",
+            "main.cc",
+            "-mno-movbe"
+          ],
+          "env_updates": [
+            "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
+            "CCACHE_DIR=/var/cache/distfiles/ccache",
+            "CCACHE_UMASK=002"
+          ]
+        }
+      }
+    ]
   }
 ]