Merge.
authorDavid Mandelin <dmandelin@mozilla.com>
Fri, 06 Aug 2010 11:40:45 -0700
changeset 53332 4a7aa9d7b2ce39fba8065537518bbce3bedb22d2
parent 53330 6f906ae73fe76f29a7d9282051826d94044d250b (current diff)
parent 53331 a2b7c9579629727dfe0e14fda00bf31e5a748e3c (diff)
child 53334 f4f694c2496100ed9462d9cb30906ff58aa09498
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b3pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge.
--- a/js/src/tests/ecma/extensions/trapflatclosure.js
+++ b/js/src/tests/ecma/extensions/trapflatclosure.js
@@ -9,17 +9,15 @@ var summary = 'flat closure debugged via
 var expect = "abc";
 var actual = expect;
 
 function a(x, y) {
     return function () { return x; };
 }
 
 var f = a("abc", 123);
-if (this.trap && this.setDebug) {
-    setDebug(true);
+if (this.trap)
     trap(f, "try {actual = x} catch (e) {actual = e}");
-}
 f();
 
 reportCompare(expect, actual, summary);
 
 printStatus("All tests passed!");