From e7a69983bed9b8b22fd797605a4d7ea1fa46018f Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Tue, 22 Apr 2014 14:13:15 -0700
Subject: [PATCH] Bug 906525 - Re-enable PJS timeout tests. (r=nmatsakis)

---
 js/src/jit-test/tests/parallel/gc-timeout.js | 27 ++++++++++++++++++++
 js/src/jit-test/tests/parallel/timeout.js    | 17 ++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 js/src/jit-test/tests/parallel/gc-timeout.js
 create mode 100644 js/src/jit-test/tests/parallel/timeout.js

diff --git a/js/src/jit-test/tests/parallel/gc-timeout.js b/js/src/jit-test/tests/parallel/gc-timeout.js
new file mode 100644
index 000000000000..2c125445a146
--- /dev/null
+++ b/js/src/jit-test/tests/parallel/gc-timeout.js
@@ -0,0 +1,27 @@
+// |jit-test| exitstatus: 6;
+
+// One sneaky way to run GC during a parallel section is to invoke the
+// gc() function during the parallel timeout!
+
+load(libdir + "parallelarray-helpers.js");
+
+function iterate(x) {
+  while (x == 2046) {
+    // for exactly one index, this infinitely loops!
+    // this ensures that the warmup doesn't loop.
+  }
+  return 22;
+}
+
+function timeoutfunc() {
+  print("Timed out, invoking the GC");
+  gc();
+  return false;
+}
+
+timeout(1, timeoutfunc);
+
+if (getBuildConfiguration().parallelJS)
+  Array.buildPar(2048, iterate);
+else
+  while(true);
diff --git a/js/src/jit-test/tests/parallel/timeout.js b/js/src/jit-test/tests/parallel/timeout.js
new file mode 100644
index 000000000000..095756dcce5c
--- /dev/null
+++ b/js/src/jit-test/tests/parallel/timeout.js
@@ -0,0 +1,17 @@
+// |jit-test| exitstatus: 6;
+
+load(libdir + "parallelarray-helpers.js");
+
+function iterate(x) {
+  while (x == 2046) {
+    // for exactly one index, this infinitely loops!
+    // this ensures that the warmup doesn't loop.
+  }
+  return 22;
+}
+
+timeout(1);
+if (getBuildConfiguration().parallelJS)
+  Array.buildPar(2048, iterate);
+else
+  while (true);