diff options
| author | Jian Cai <jiancai@google.com> | 2020-01-16 16:12:34 -0800 |
|---|---|---|
| committer | Jian Cai <jiancai@google.com> | 2020-01-22 18:53:56 +0000 |
| commit | c2dec89d0d9758bcbb2457a04f4bf49d5bf4731c (patch) | |
| tree | 8b1021df8ed9ca792568c45eea5ad0cfcf2b92ab /compiler_wrapper/testdata | |
| parent | be0b3faefdbd5681ce49906246c30e117881a1ab (diff) | |
| download | toolchain-utils-c2dec89d0d9758bcbb2457a04f4bf49d5bf4731c.tar.gz | |
compiler_wrapper: add python search path
Exporting BISECT_STAGE to POPULATE_GOOD currently makes the wrapper fail
to build any files with the error message of "ModuleNotFoundError: No
module named 'bisect_driver'". This patch fixes the issue by adding
search path for bisect_driver.py explicitly.
BUG=chromium:1042452
TEST=verified locally.
Change-Id: I7c73459b377d9011c7087a9e241db378ffb216e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2003947
Tested-by: Jian Cai <jiancai@google.com>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: George Burgess <gbiv@chromium.org>
Diffstat (limited to 'compiler_wrapper/testdata')
6 files changed, 45 insertions, 9 deletions
diff --git a/compiler_wrapper/testdata/android_golden/bisect.json b/compiler_wrapper/testdata/android_golden/bisect.json index a24222ab..be07da68 100644 --- a/compiler_wrapper/testdata/android_golden/bisect.json +++ b/compiler_wrapper/testdata/android_golden/bisect.json @@ -25,6 +25,9 @@ "/user/home/ANDROID_BISECT", "/tmp/stable/clang.real", "main.cc" + ], + "env_updates": [ + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] } } @@ -57,6 +60,9 @@ "someBisectDir", "/tmp/stable/clang.real", "main.cc" + ], + "env_updates": [ + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] } } @@ -92,6 +98,9 @@ "someBisectDir", "/tmp/stable/clang.real", "main.cc" + ], + "env_updates": [ + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] }, "stdout": "somemessage", diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json index 5920a365..ad4feac3 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json @@ -39,6 +39,9 @@ "-Wno-unknown-warning-option", "main.cc", "-Wno-implicit-int-float-conversion" + ], + "env_updates": [ + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] } } @@ -85,6 +88,9 @@ "-Wno-unknown-warning-option", "main.cc", "-Wno-implicit-int-float-conversion" + ], + "env_updates": [ + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] } } @@ -134,6 +140,9 @@ "-Wno-unknown-warning-option", "main.cc", "-Wno-implicit-int-float-conversion" + ], + "env_updates": [ + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] }, "stdout": "somemessage", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json index c1daaa88..6e1d4981 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json @@ -54,7 +54,8 @@ "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", - "CCACHE_CPP2=yes" + "CCACHE_CPP2=yes", + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] } } @@ -116,7 +117,8 @@ "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", - "CCACHE_CPP2=yes" + "CCACHE_CPP2=yes", + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] } } @@ -181,7 +183,8 @@ "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", - "CCACHE_CPP2=yes" + "CCACHE_CPP2=yes", + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] }, "stdout": "somemessage", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json index c1daaa88..6e1d4981 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json @@ -54,7 +54,8 @@ "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", - "CCACHE_CPP2=yes" + "CCACHE_CPP2=yes", + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] } } @@ -116,7 +117,8 @@ "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", - "CCACHE_CPP2=yes" + "CCACHE_CPP2=yes", + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] } } @@ -181,7 +183,8 @@ "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", - "CCACHE_CPP2=yes" + "CCACHE_CPP2=yes", + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] }, "stdout": "somemessage", diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json index 46c29635..3fafcf01 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json @@ -48,6 +48,9 @@ "-B../../bin", "-target", "x86_64-cros-linux-gnu" + ], + "env_updates": [ + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] } } @@ -103,6 +106,9 @@ "-B../../bin", "-target", "x86_64-cros-linux-gnu" + ], + "env_updates": [ + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] } } @@ -161,6 +167,9 @@ "-B../../bin", "-target", "x86_64-cros-linux-gnu" + ], + "env_updates": [ + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] }, "stdout": "somemessage", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json index b97c379d..7d2acdac 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json @@ -46,7 +46,8 @@ "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", - "CCACHE_CPP2=yes" + "CCACHE_CPP2=yes", + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] } } @@ -100,7 +101,8 @@ "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", - "CCACHE_CPP2=yes" + "CCACHE_CPP2=yes", + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] } } @@ -157,7 +159,8 @@ "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", - "CCACHE_CPP2=yes" + "CCACHE_CPP2=yes", + "PYTHONPATH=/media/storage/jiancai/chromeos/src/third_party/toolchain-utils/compiler_wrapper" ] }, "stdout": "somemessage", |