[Gnash-commit] /srv/bzr/gnash/trunk r9506: Modify Try.as for a bug-fixed ming. Don't build for versions of ming under

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9506
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Sun 2008-07-20 15:09:59 +0200
message:
  Modify Try.as for a bug-fixed ming. Don't build for versions of ming under
  0.4.1 (CVS head of today).
modified:
  testsuite/actionscript.all/Try.as
    ------------------------------------------------------------
    revno: 9502.1.6
    committer: Benjamin Wolsey <address@hidden>
    branch nick: workingcopy
    timestamp: Sun 2008-07-20 15:02:21 +0200
    message:
      Update Try.as now that ming produces the correct output. The old test is
      in misc-swfmill.all. This test only runs for ming 0.4.1 (CVS head for
      today).
    modified:
      testsuite/actionscript.all/Try.as

=== modified file 'testsuite/actionscript.all/Try.as'
--- a/testsuite/actionscript.all/Try.as 2008-06-11 19:54:43 +0000
+++ b/testsuite/actionscript.all/Try.as 2008-07-20 13:02:21 +0000
@@ -32,7 +32,7 @@
 // Try catch
 // Try (throw) catch
 
-#if MING_VERSION_CODE >= 00040006
+#if MING_VERSION_CODE >= 00040100
 
 throwfunc = function()
 {
@@ -53,11 +53,7 @@
 finally { r +="finally "; };
 r += ".";
 
-#if OUTPUT_VERSION < 7
-check_equals(r, "1: try body catch  finally .");
-#else
-check_equals(r, "1: try body catch undefined finally .");
-#endif
+check_equals(r, "1: try body finally .");
 
 r = "2: ";
 try { r += "try "; throw ("thrown"); r += "body "; }
@@ -88,8 +84,9 @@
 r = "5: ";
 try { r += "try "; r += "body "; }
 catch (d) { r += "catch "; r+= d + " "; };
-r += ".";
-check_equals(r, "5: try body catch pre-existing variable d .");
+r += ". ";
+r += d;
+check_equals(r, "5: try body . pre-existing variable d");
 
 r = "6: ";
 try { r += "try "; throw ("thrown"); r += "body "; }
@@ -126,11 +123,7 @@
 }
 catch (i) { r += i + " "; };
 r += ".";
-#if OUTPUT_VERSION < 7
-check_equals(r, "8: try finally finally2 try2 catch2  thrown .");
-#else
-check_equals(r, "8: try finally finally2 try2 catch2 undefined thrown .");
-#endif
+check_equals(r, "8: try finally finally2 try2 thrown .");
 
 try {
     try {
@@ -149,39 +142,27 @@
 }
 catch (l) { r+= "catch3 "; r += l + " "; };
 r += ".";
-#if OUTPUT_VERSION < 7
-check_equals(r, "9: try finally catch thrown finally2 try2 catch2  catch3  .");
-#else
-check_equals(r, "9: try finally catch thrown finally2 try2 catch2 undefined 
catch3 undefined .");
-#endif
-
-r = "10: ";
-try {
-    try { throw "try"; }
-    catch (e) { throw "catch"; }
-    finally { throw "finally"; };
-}
-catch (m) { r+= "catch " + m; };
-r += ".";
-check_equals(r, "10: catch finally.");
-
-r = "10: ";
-try {
-    try { throw "try"; }
-    catch (e) { throw "catch"; }
-    finally { throw "finally"; };
-}
-catch (m) { r+= "catch " + m; };
-r += ".";
-check_equals(r, "10: catch finally.");
-
-
-//try { throwfunc(); }
-//catch (g) { trace ("catch"); trace (g); };
-
-//try { throw "thrown"; }
-//finally { };
-//trace ("Don't reach this point");
+check_equals(r, "9: try finally catch thrown finally2 try2 .");
+
+r = "10: ";
+try {
+    try { throw "try"; }
+    catch (e) { throw "catch"; }
+    finally { throw "finally"; };
+}
+catch (m) { r+= "catch " + m; };
+r += ".";
+check_equals(r, "10: catch finally.");
+
+r = "10: ";
+try {
+    try { throw "try"; }
+    catch (e) { throw "catch"; }
+    finally { throw "finally"; };
+}
+catch (m) { r+= "catch " + m; };
+r += ".";
+check_equals(r, "10: catch finally.");
 
 totals();