From 820bffa81f7064766a358db4c9aed29759812ab8 Mon Sep 17 00:00:00 2001
From: Tobias Bosch <tbosch@google.com>
Date: Mon, 30 Sep 2019 15:53:52 -0700
Subject: Android wrapper: Support @param files for bisection.

BUG=chromium:773875
TEST=unit test

Change-Id: I94f99977f823e098aae39c79b9e01603fd84f5fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1832309
Tested-by: Tobias Bosch <tbosch@google.com>
Reviewed-by: George Burgess <gbiv@chromium.org>
---
 .../testdata/cros_clang_host_golden/bisect.json    | 49 ++++++++++++++++++++--
 1 file changed, 45 insertions(+), 4 deletions(-)

(limited to 'compiler_wrapper/testdata/cros_clang_host_golden')

diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
index 47ed1949..5a67a635 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
@@ -1,4 +1,43 @@
 [
+  {
+    "wd": "/tmp/stable",
+    "env": [
+      "BISECT_STAGE=someBisectStage"
+    ],
+    "wrapper": {
+      "cmd": {
+        "path": "./x86_64-cros-linux-gnu-clang",
+        "args": [
+          "main.cc"
+        ]
+      }
+    },
+    "cmds": [
+      {
+        "cmd": {
+          "path": "/usr/bin/env",
+          "args": [
+            "python",
+            "-c",
+            "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'rb') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n",
+            "someBisectStage",
+            "/tmp/sysroot_bisect",
+            "/tmp/stable/clang",
+            "-Qunused-arguments",
+            "-grecord-gcc-switches",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
+            "-Wno-unused-local-typedefs",
+            "-Wno-deprecated-declarations",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "main.cc"
+          ]
+        }
+      }
+    ]
+  },
   {
     "wd": "/tmp/stable",
     "env": [
@@ -16,10 +55,11 @@
     "cmds": [
       {
         "cmd": {
-          "path": "/usr/bin/python2",
+          "path": "/usr/bin/env",
           "args": [
+            "python",
             "-c",
-            "import bisect_driver; sys.exit(bisect_driver.bisect_driver(sys.argv[1], sys.argv[2], sys.argv[3:]))",
+            "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'rb') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n",
             "someBisectStage",
             "someBisectDir",
             "/tmp/stable/clang",
@@ -58,10 +98,11 @@
     "cmds": [
       {
         "cmd": {
-          "path": "/usr/bin/python2",
+          "path": "/usr/bin/env",
           "args": [
+            "python",
             "-c",
-            "import bisect_driver; sys.exit(bisect_driver.bisect_driver(sys.argv[1], sys.argv[2], sys.argv[3:]))",
+            "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'rb') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n",
             "someBisectStage",
             "someBisectDir",
             "/tmp/stable/clang",
-- 
cgit v1.2.3