summaryrefslogtreecommitdiffstats
path: root/tests/DumpRenderTree
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-05-14 03:11:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-05-14 03:11:38 -0700
commit77b8e6149e497cedbd98c7fae83886be0d6fb215 (patch)
treea96e4433ac82dbc0750e4e3643252f8b2a4466a5 /tests/DumpRenderTree
parente26867793b6a0c226e02f7da880b06efbcb8707e (diff)
parentc1d8651538cf01881c42d638c836ff6405037ffe (diff)
downloadframeworks_base-77b8e6149e497cedbd98c7fae83886be0d6fb215.zip
frameworks_base-77b8e6149e497cedbd98c7fae83886be0d6fb215.tar.gz
frameworks_base-77b8e6149e497cedbd98c7fae83886be0d6fb215.tar.bz2
Merge "Change the default JS engine for Android-specific layout test results in DRT from JSC to V8"
Diffstat (limited to 'tests/DumpRenderTree')
-rw-r--r--tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
index 0e39054..6b9bd65 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
@@ -361,8 +361,8 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh
// Read settings
mTestPathPrefix = (new File(LAYOUT_TESTS_ROOT + runner.mTestPath)).getAbsolutePath();
mRebaselineResults = runner.mRebaseline;
- // JSC is the default JavaScript engine.
- mJsEngine = runner.mJsEngine == null ? "jsc" : runner.mJsEngine;
+ // V8 is the default JavaScript engine.
+ mJsEngine = runner.mJsEngine == null ? "v8" : runner.mJsEngine;
int timeout = runner.mTimeoutInMillis;
if (timeout <= 0) {