diff options
| author | sbc <sbc@chromium.org> | 2015-09-17 15:06:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-17 22:06:42 +0000 |
| commit | ec2739960cfed742e191c1584316d2bf261a8866 (patch) | |
| tree | 54f25dc987252a8413723013c14d6333f4209e96 /native_client_sdk | |
| parent | 4f0e1427488d5101c877f232258320c8d8e0c41f (diff) | |
| download | chromium_src-ec2739960cfed742e191c1584316d2bf261a8866.zip chromium_src-ec2739960cfed742e191c1584316d2bf261a8866.tar.gz chromium_src-ec2739960cfed742e191c1584316d2bf261a8866.tar.bz2 | |
[NaCl SDK] Handle missing PATH environment variable in sel_ldr.py
This was showing up in the perl tests in naclports which
use 'env -i' to run sel_ldr.py
R=bradnelson
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_nacl_sdk;tryserver.chromium.mac:mac_nacl_sdk
Review URL: https://codereview.chromium.org/1349753002
Cr-Commit-Position: refs/heads/master@{#349508}
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/tools/sel_ldr.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/native_client_sdk/src/tools/sel_ldr.py b/native_client_sdk/src/tools/sel_ldr.py index a4aa5fd..5461757 100755 --- a/native_client_sdk/src/tools/sel_ldr.py +++ b/native_client_sdk/src/tools/sel_ldr.py @@ -33,12 +33,11 @@ Log.verbose = False def FindQemu(): + path = os.environ.get('PATH', '').split(os.pathsep) qemu_locations = [os.path.join(SCRIPT_DIR, 'qemu_arm'), os.path.join(SCRIPT_DIR, 'qemu-arm')] - qemu_locations += [os.path.join(path, 'qemu_arm') - for path in os.environ["PATH"].split(os.pathsep)] - qemu_locations += [os.path.join(path, 'qemu-arm') - for path in os.environ["PATH"].split(os.pathsep)] + qemu_locations += [os.path.join(p, 'qemu_arm') for p in path] + qemu_locations += [os.path.join(p, 'qemu-arm') for p in path] # See if qemu is in any of these locations. qemu_bin = None for loc in qemu_locations: |