diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 17:47:39 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 17:47:39 +0000 |
| commit | 604ce328ad19fafa691722bedade78332aca5a13 (patch) | |
| tree | 7299d07a35a77fa881466012a7a98df9b650b36f /ppapi/native_client | |
| parent | 08596f12bd48f1dd2d4958eed84cbb8c4d275e5d (diff) | |
| download | chromium_src-604ce328ad19fafa691722bedade78332aca5a13.zip chromium_src-604ce328ad19fafa691722bedade78332aca5a13.tar.gz chromium_src-604ce328ad19fafa691722bedade78332aca5a13.tar.bz2 | |
NaCl: Fix Python sys.path ordering in nacl_integration's browser tests
NaCl commit r12395 changed NaCl's Scons build so that it doesn't clear
out environment variables. But this allows PYTHONPATH to leak into
browser_tester which causes it to import the wrong common.py module
from somewhere (I don't know where), giving this error:
Traceback (most recent call last):
File "/Volumes/data/b/build/slave/mac/build/src/ppapi/native_client/tools/browser_tester/browser_tester.py", line 25, in <module>
import memcheck_analyze
File "/Volumes/data/b/build/slave/mac/build/src/ppapi/native_client/tools/browser_tester/../../../../tools/valgrind/memcheck_analyze.py", line 34, in <module>
_BORING_CALLERS = common.BoringCallers(mangled=True, use_re_wildcards=True)
AttributeError: 'module' object has no attribute 'BoringCallers'
Fix this by using sys.path.insert(0, X), usually preferred over
sys.path.append(X).
(This was previously committed with a DEPS update in r235923, but that
got reverted.)
BUG=319585
TEST=nacl_integration
Review URL: https://codereview.chromium.org/76343002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
| -rwxr-xr-x | ppapi/native_client/tools/browser_tester/browser_tester.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/native_client/tools/browser_tester/browser_tester.py b/ppapi/native_client/tools/browser_tester/browser_tester.py index 3f1da34..844956d 100755 --- a/ppapi/native_client/tools/browser_tester/browser_tester.py +++ b/ppapi/native_client/tools/browser_tester/browser_tester.py @@ -14,9 +14,9 @@ import urllib # Allow the import of third party modules script_dir = os.path.dirname(os.path.abspath(__file__)) -sys.path.append(os.path.join(script_dir, '../../../../third_party/')) -sys.path.append(os.path.join(script_dir, '../../../../tools/valgrind/')) -sys.path.append(os.path.join(script_dir, '../../../../testing/')) +sys.path.insert(0, os.path.join(script_dir, '../../../../third_party/')) +sys.path.insert(0, os.path.join(script_dir, '../../../../tools/valgrind/')) +sys.path.insert(0, os.path.join(script_dir, '../../../../testing/')) import browsertester.browserlauncher import browsertester.rpclistener |