Bug 1087361 - Ignore some test that time out when run with compacting GC zeal mode r=sfink

js/src/Makefile.in

@@ -134,7 +134,9 @@ check-style::
 
 check-jit-test::
 	$(JITTEST_ASAN_ENV) $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/jit-test/jit_test.py \
-	        --no-slow --no-progress --tinderbox --tbpl $(JITTEST_VALGRIND_FLAG) \
+	        --no-slow --no-progress --tinderbox --tbpl \
+			$(JITTEST_VALGRIND_FLAG) \
+			$(JITTEST_EXTRA_ARGS) \
 	        $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX)
 
 check:: check-style

js/src/devtools/automation/autospider.sh

@@ -116,6 +116,9 @@ elif [[ "$VARIANT" = "generational" ]]; then
     # Generational is currently being used for compacting GC
     export JS_GC_ZEAL=14
 
+    # Ignore timeouts from tests that are known to take too long with this zeal mode
+    export JITTEST_EXTRA_ARGS=--ignore-timeouts=$ABSDIR/cgc-jittest-timeouts.txt
+
     # rootanalysis builds are currently only done on Linux, which should have
     # setarch, but just in case we enable them on another platform:
     if type setarch >/dev/null 2>&1; then
@@ -125,5 +128,7 @@ fi
 
 $COMMAND_PREFIX $MAKE check || exit 1
 $COMMAND_PREFIX $MAKE check-jit-test || exit 1
-$COMMAND_PREFIX $MAKE check-jstests || exit 1
+if [[ "$VARIANT" != "generational" ]]; then
+    $COMMAND_PREFIX $MAKE check-jstests || exit 1
+fi
 $COMMAND_PREFIX $OBJDIR/dist/bin/jsapi-tests || exit 1

js/src/devtools/automation/cgc-jittest-timeouts.txt

@@ -0,0 +1,15 @@
+auto-regress/bug653395.js
+auto-regress/bug675251.js
+basic/bug632964-regexp.js
+basic/testBug614653.js
+basic/testBug686274.js
+basic/testTypedArrayInit.js
+gc/bug-1014972.js
+gc/bug-906236.js
+gc/bug-906241.js
+parallel/alloc-many-objs.js
+parallel/alloc-too-many-objs.js
+self-test/assertDeepEq.js
+v8-v5/check-splay.js
+baseline/bug847446.js
+baseline/bug852175.js