diff options
| author | Tobias Bosch <tbosch@google.com> | 2019-10-11 11:26:36 -0700 |
|---|---|---|
| committer | Manoj Gupta <manojgupta@chromium.org> | 2019-10-11 18:56:28 +0000 |
| commit | 6ecb3475254b6ab7ab3be6a2f58abc2f2fdd3da8 (patch) | |
| tree | 73874c62dcf685c5f28989db135ea19984b2c09d /compiler_wrapper/testdata | |
| parent | f40d1b4761c07826176d3075148ee21ce75da465 (diff) | |
| download | toolchain-utils-6ecb3475254b6ab7ab3be6a2f58abc2f2fdd3da8.tar.gz | |
compiler_wrapper: Replace UserHomeDir uses.
os.UserHomeDir is not available in the Go version in Cros SDK.
Replace by explicit env value of "HOME".
BUG=None
TEST=go test
Change-Id: Ia0da2d9bce042510fcc1b14cb074dadfe4d0f2f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1856381
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: George Burgess <gbiv@chromium.org>
Reviewed-by: Tobias Bosch <tbosch@google.com>
Tested-by: Manoj Gupta <manojgupta@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Diffstat (limited to 'compiler_wrapper/testdata')
6 files changed, 37 insertions, 19 deletions
diff --git a/compiler_wrapper/testdata/android_golden/bisect.json b/compiler_wrapper/testdata/android_golden/bisect.json index 41310ca1..a24222ab 100644 --- a/compiler_wrapper/testdata/android_golden/bisect.json +++ b/compiler_wrapper/testdata/android_golden/bisect.json @@ -2,7 +2,8 @@ { "wd": "/tmp/stable", "env": [ - "BISECT_STAGE=someBisectStage" + "BISECT_STAGE=someBisectStage", + "HOME=/user/home" ], "wrapper": { "cmd": { @@ -21,7 +22,7 @@ "-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", - "$HOME/ANDROID_BISECT", + "/user/home/ANDROID_BISECT", "/tmp/stable/clang.real", "main.cc" ] @@ -33,7 +34,8 @@ "wd": "/tmp/stable", "env": [ "BISECT_STAGE=someBisectStage", - "BISECT_DIR=someBisectDir" + "BISECT_DIR=someBisectDir", + "HOME=/user/home" ], "wrapper": { "cmd": { @@ -64,7 +66,8 @@ "wd": "/tmp/stable", "env": [ "BISECT_STAGE=someBisectStage", - "BISECT_DIR=someBisectDir" + "BISECT_DIR=someBisectDir", + "HOME=/user/home" ], "wrapper": { "cmd": { diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json index 5a67a635..b9b1509f 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json @@ -2,7 +2,8 @@ { "wd": "/tmp/stable", "env": [ - "BISECT_STAGE=someBisectStage" + "BISECT_STAGE=someBisectStage", + "HOME=/user/home" ], "wrapper": { "cmd": { @@ -42,7 +43,8 @@ "wd": "/tmp/stable", "env": [ "BISECT_STAGE=someBisectStage", - "BISECT_DIR=someBisectDir" + "BISECT_DIR=someBisectDir", + "HOME=/user/home" ], "wrapper": { "cmd": { @@ -82,7 +84,8 @@ "wd": "/tmp/stable", "env": [ "BISECT_STAGE=someBisectStage", - "BISECT_DIR=someBisectDir" + "BISECT_DIR=someBisectDir", + "HOME=/user/home" ], "wrapper": { "cmd": { diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json index e0709e04..f9a503f3 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json @@ -2,7 +2,8 @@ { "wd": "/tmp/stable", "env": [ - "BISECT_STAGE=someBisectStage" + "BISECT_STAGE=someBisectStage", + "HOME=/user/home" ], "wrapper": { "cmd": { @@ -58,7 +59,8 @@ "wd": "/tmp/stable", "env": [ "BISECT_STAGE=someBisectStage", - "BISECT_DIR=someBisectDir" + "BISECT_DIR=someBisectDir", + "HOME=/user/home" ], "wrapper": { "cmd": { @@ -114,7 +116,8 @@ "wd": "/tmp/stable", "env": [ "BISECT_STAGE=someBisectStage", - "BISECT_DIR=someBisectDir" + "BISECT_DIR=someBisectDir", + "HOME=/user/home" ], "wrapper": { "cmd": { diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json index 905a8692..56b7b3ed 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json @@ -2,7 +2,8 @@ { "wd": "/tmp/stable", "env": [ - "BISECT_STAGE=someBisectStage" + "BISECT_STAGE=someBisectStage", + "HOME=/user/home" ], "wrapper": { "cmd": { @@ -63,7 +64,8 @@ "wd": "/tmp/stable", "env": [ "BISECT_STAGE=someBisectStage", - "BISECT_DIR=someBisectDir" + "BISECT_DIR=someBisectDir", + "HOME=/user/home" ], "wrapper": { "cmd": { @@ -124,7 +126,8 @@ "wd": "/tmp/stable", "env": [ "BISECT_STAGE=someBisectStage", - "BISECT_DIR=someBisectDir" + "BISECT_DIR=someBisectDir", + "HOME=/user/home" ], "wrapper": { "cmd": { diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json index c8255e56..f3061817 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json @@ -2,7 +2,8 @@ { "wd": "/tmp/stable", "env": [ - "BISECT_STAGE=someBisectStage" + "BISECT_STAGE=someBisectStage", + "HOME=/user/home" ], "wrapper": { "cmd": { @@ -51,7 +52,8 @@ "wd": "/tmp/stable", "env": [ "BISECT_STAGE=someBisectStage", - "BISECT_DIR=someBisectDir" + "BISECT_DIR=someBisectDir", + "HOME=/user/home" ], "wrapper": { "cmd": { @@ -100,7 +102,8 @@ "wd": "/tmp/stable", "env": [ "BISECT_STAGE=someBisectStage", - "BISECT_DIR=someBisectDir" + "BISECT_DIR=someBisectDir", + "HOME=/user/home" ], "wrapper": { "cmd": { diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json index d81622fd..4bc696d3 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json @@ -2,7 +2,8 @@ { "wd": "/tmp/stable", "env": [ - "BISECT_STAGE=someBisectStage" + "BISECT_STAGE=someBisectStage", + "HOME=/user/home" ], "wrapper": { "cmd": { @@ -50,7 +51,8 @@ "wd": "/tmp/stable", "env": [ "BISECT_STAGE=someBisectStage", - "BISECT_DIR=someBisectDir" + "BISECT_DIR=someBisectDir", + "HOME=/user/home" ], "wrapper": { "cmd": { @@ -98,7 +100,8 @@ "wd": "/tmp/stable", "env": [ "BISECT_STAGE=someBisectStage", - "BISECT_DIR=someBisectDir" + "BISECT_DIR=someBisectDir", + "HOME=/user/home" ], "wrapper": { "cmd": { |