Merge regexp2000 back into bleeding_edge

test/mozilla/mozilla.status

Index: test/mozilla/mozilla.status
===================================================================
--- test/mozilla/mozilla.status	(revision 830)
+++ test/mozilla/mozilla.status	(working copy)
@@ -217,7 +217,7 @@
 # depth 500.  KJS detects the case, and return null from the match,
 # and passes this test (the test doesn't check for a correct return
 # value).
-ecma_3/RegExp/regress-119909: FAIL_OK
+ecma_3/RegExp/regress-119909: PASS || FAIL_OK
 
 
 # Difference in the way capturing subpatterns work.  In JS, when the
@@ -236,6 +236,13 @@
 ecma_3/RegExp/regress-330684: FAIL_OK
 
 
+# This test contains a regexp that runs exponentially long.  Spidermonkey
+# standalone will hang, though apparently inside Firefox it will trigger a
+# long-running-script timeout.  JSCRE passes by hitting the matchLimit and
+# just pretending that an exhaustive search found no match.
+ecma_3/RegExp/regress-307456: PASS || FAIL_OK
+
+
 # We do not detect overflow in bounds for back references and {}
 # quantifiers.  Might fix by parsing numbers differently?
 js1_5/Regress/regress-230216-2: FAIL_OK
@@ -247,11 +254,11 @@
 
 
 # Regexp too long for PCRE.
-js1_5/Regress/regress-280769: FAIL_OK
-js1_5/Regress/regress-280769-1: FAIL_OK
-js1_5/Regress/regress-280769-2: FAIL_OK
-js1_5/Regress/regress-280769-4: FAIL_OK
-js1_5/Regress/regress-280769-5: FAIL_OK
+js1_5/Regress/regress-280769: PASS || FAIL
+js1_5/Regress/regress-280769-1: PASS || FAIL
+js1_5/Regress/regress-280769-2: PASS || FAIL
+js1_5/Regress/regress-280769-4: PASS || FAIL
+js1_5/Regress/regress-280769-5: PASS || FAIL
 
 
 # We do not support static RegExp.multiline - should we?.
@@ -489,7 +496,7 @@
 # behavior and not the ECMA spec.
 ecma_3/RegExp/15.10.2-1: FAIL_OK
 ecma_3/RegExp/perlstress-001: FAIL_OK
-ecma_3/RegExp/regress-334158: FAIL_OK
+ecma_3/RegExp/regress-334158: PASS || FAIL
 
 
 # This test requires a failure if we try to compile a function with more