Trigger exception debug events on Promise reject.

test/mjsunit/es6/debug-promises/throw-uncaught-all.js

Index: test/mjsunit/es6/debug-promises/throw-uncaught-all.js
diff --git a/test/mjsunit/es6/debug-promises-uncaught-all.js b/test/mjsunit/es6/debug-promises/throw-uncaught-all.js
similarity index 61%
rename from test/mjsunit/es6/debug-promises-uncaught-all.js
rename to test/mjsunit/es6/debug-promises/throw-uncaught-all.js
index a8dcd17f1246d8af40f4ed95f9a50b88d93191c0..7552589fa72c13160f9b55fc6c6552e4115b88b5 100644
--- a/test/mjsunit/es6/debug-promises-uncaught-all.js
+++ b/test/mjsunit/es6/debug-promises/throw-uncaught-all.js
@@ -2,17 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --expose-debug-as debug
+// Flags: --expose-debug-as debug --allow-natives-syntax
 
 // Test debug events when we listen to all exceptions and
-// there is a catch handler for the exception thrown in a Promise.
+// there is no catch handler for the exception thrown in a Promise.
 // We expect an Exception debug event with a promise to be triggered.
 
 Debug = debug.Debug;
 
+var expected_events = 1;
 var log = [];
-var step = 0;
-var exception = undefined;
 
 var p = new Promise(function(resolve, reject) {
   log.push("resolve");
@@ -26,27 +25,20 @@ var q = p.chain(
   });
 
 function listener(event, exec_state, event_data, data) {
-  if (event == Debug.DebugEvent.AsyncTaskEvent) return;
   try {
     // Ignore exceptions during startup in stress runs.
-    if (step >= 1) return;
-    assertEquals(["resolve", "end main", "throw"], log);
     if (event == Debug.DebugEvent.Exception) {
-      assertEquals(0, step);
+      expected_events--;
+      assertTrue(expected_events >= 0);
       assertEquals("uncaught", event_data.exception().message);
       assertTrue(event_data.promise() instanceof Promise);
       assertEquals(q, event_data.promise());
       assertTrue(event_data.uncaught());
       // Assert that the debug event is triggered at the throw site.
       assertTrue(exec_state.frame(0).sourceLineText().indexOf("// event") > 0);
-      step++;
     }
   } catch (e) {
-    // Signal a failure with exit code 1.  This is necessary since the
-    // debugger swallows exceptions and we expect the chained function
-    // and this listener to be executed after the main script is finished.
-    print("Unexpected exception: " + e + "\n" + e.stack);
-    quit(1);
+    %AbortJS(e + "\n" + e.stack);
   }
 }
 
@@ -54,3 +46,25 @@ Debug.setBreakOnException();
 Debug.setListener(listener);
 
 log.push("end main");
+
+function testDone(iteration) {
+  function checkResult() {
+    try {
+      assertTrue(iteration < 10);
+      if (expected_events === 0) {
+        assertEquals(["resolve", "end main", "throw"], log);
+      } else {
+        testDone(iteration + 1);
+      }
+    } catch (e) {
+      %AbortJS(e + "\n" + e.stack);
+    }
+  }
+
+  // Rerun testDone through the Object.observe processing loop.
+  var dummy = {};
+  Object.observe(dummy, checkResult);
+  dummy.dummy = dummy;
+}
+
+testDone(0);