Android: increase default test timeout and skip time sensitive mjsunit/regress/regres...

R=yangguo@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10836049

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12249 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/Makefile b/Makefile
index 5f6ff11..07549a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -210,6 +210,7 @@ $(addsuffix .sync, $(ANDROID_BUILDS)): $$(basename $$@)
 $(addsuffix .check, $(ANDROID_BUILDS)): $$(basename $$@).sync
        @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --arch-and-mode=$(basename $@) \
+            --timeout=600 \
             --special-command="tools/android-run.py @"
 
 $(addsuffix .check, $(ANDROID_ARCHES)): \

diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status
index dda2db5..d8dea9b 100644 (file)
--- a/test/mjsunit/mjsunit.status
+++ b/test/mjsunit/mjsunit.status
@@ -60,7 +60,7 @@ array-constructor: PASS || TIMEOUT
 unicode-case-overoptimization: PASS, TIMEOUT if ($arch == arm || $arch == android_arm || $arch == mipsel)
 
 # Test Crankshaft compilation time.  Expected to take too long in debug mode.
-regress/regress-1969: PASS, SKIP if $mode == debug
+regress/regress-1969: PASS, SKIP if ($mode == debug || $arch == android_arm)
 
 ##############################################################################
 # This test sets the umask on a per-process basis and hence cannot be