summaryrefslogtreecommitdiffstats
path: root/tests/DumpRenderTree/assets/run_layout_tests.py
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-03-11 13:27:20 +0000
committerBen Murdoch <benm@google.com>2010-03-11 13:27:20 +0000
commitdc2711d47d2c05ee1ee1f15131676b53cb3c1d5e (patch)
tree6dfece088c1af9c3aa4e0379a88237136d7911aa /tests/DumpRenderTree/assets/run_layout_tests.py
parent409578fcb1d8ecfee0ae07b1a34a6e6cb184a0ce (diff)
downloadframeworks_base-dc2711d47d2c05ee1ee1f15131676b53cb3c1d5e.zip
frameworks_base-dc2711d47d2c05ee1ee1f15131676b53cb3c1d5e.tar.gz
frameworks_base-dc2711d47d2c05ee1ee1f15131676b53cb3c1d5e.tar.bz2
Check if the JS_ENGINE key exists as an environment variable before reading it.
Change-Id: I274b23ea53ec0129ea3b52ff66322f7069338f53
Diffstat (limited to 'tests/DumpRenderTree/assets/run_layout_tests.py')
-rwxr-xr-xtests/DumpRenderTree/assets/run_layout_tests.py2
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