diff options
| author | Tobias Bosch <tbosch@google.com> | 2019-09-30 15:53:52 -0700 |
|---|---|---|
| committer | Tobias Bosch <tbosch@google.com> | 2019-09-30 23:24:29 +0000 |
| commit | 820bffa81f7064766a358db4c9aed29759812ab8 (patch) | |
| tree | 058700134942d48696706c620586d71aab0284b5 /compiler_wrapper/testdata/cros_nonhardened_golden | |
| parent | c58f8d5cfbfc7a9561963af92017a9d3dbdcb61d (diff) | |
| download | toolchain-utils-820bffa81f7064766a358db4c9aed29759812ab8.tar.gz | |
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>
Diffstat (limited to 'compiler_wrapper/testdata/cros_nonhardened_golden')
| -rw-r--r-- | compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json | 57 |
1 files changed, 53 insertions, 4 deletions
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json index e8a5653c..d81622fd 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json @@ -2,6 +2,53 @@ { "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", + "/usr/bin/ccache", + "../../usr/bin/clang", + "--sysroot=/usr/x86_64-cros-linux-gnu", + "-Qunused-arguments", + "-Wno-tautological-constant-compare", + "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-unknown-warning-option", + "-Wno-section", + "-static-libgcc", + "main.cc", + "-B../../bin", + "-target", + "x86_64-cros-linux-gnu" + ], + "env_updates": [ + "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", + "CCACHE_DIR=/var/cache/distfiles/ccache", + "CCACHE_UMASK=002", + "CCACHE_CPP2=yes" + ] + } + } + ] + }, + { + "wd": "/tmp/stable", + "env": [ "BISECT_STAGE=someBisectStage", "BISECT_DIR=someBisectDir" ], @@ -16,10 +63,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", "/usr/bin/ccache", @@ -66,10 +114,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", "/usr/bin/ccache", |