diff options
| author | Ben Murdoch <benm@google.com> | 2010-03-11 05:46:28 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-11 05:46:28 -0800 |
| commit | e179c1d1b66f13541fc9746c7fd50c8b03d922d5 (patch) | |
| tree | c48497212b93c5826aa33462b75da819e7d84f50 /tests/DumpRenderTree | |
| parent | 2809631e59f4f967767ca8a97b8c0589030fac27 (diff) | |
| parent | dc2711d47d2c05ee1ee1f15131676b53cb3c1d5e (diff) | |
| download | frameworks_base-e179c1d1b66f13541fc9746c7fd50c8b03d922d5.zip frameworks_base-e179c1d1b66f13541fc9746c7fd50c8b03d922d5.tar.gz frameworks_base-e179c1d1b66f13541fc9746c7fd50c8b03d922d5.tar.bz2 | |
Merge "Check if the JS_ENGINE key exists as an environment variable before reading it."
Diffstat (limited to 'tests/DumpRenderTree')
| -rwxr-xr-x | tests/DumpRenderTree/assets/run_layout_tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/DumpRenderTree/assets/run_layout_tests.py b/tests/DumpRenderTree/assets/run_layout_tests.py index 7f3ef2d..d3726c1 100755 --- a/tests/DumpRenderTree/assets/run_layout_tests.py +++ b/tests/DumpRenderTree/assets/run_layout_tests.py @@ -192,7 +192,7 @@ def main(options, args): # JS_ENGINE environment variable, which is used by the build system in # external/webkit/Android.mk. js_engine = options.js_engine - if not js_engine: + if not js_engine and os.environ.has_key('JS_ENGINE'): js_engine = os.environ['JS_ENGINE'] if js_engine: run_layout_test_cmd_postfix += " -e jsengine " + js_engine |