[Gnash-commit] /srv/bzr/gnash/trunk r9642: fix up the annoinlgy failing testcase

[Sandro Santilli]

------------------------------------------------------------
revno: 9642
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Mon 2008-08-25 21:53:52 +0200
message:
  fix up the annoinlgy failing testcase
modified:
  testsuite/actionscript.all/MovieClip.as
    ------------------------------------------------------------
    revno: 9639.1.1
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Mon 2008-08-25 21:44:01 +0200
    message:
      Fix test that broke since addition of the BOM in the vars.txt file...
    modified:
      testsuite/actionscript.all/MovieClip.as
    ------------------------------------------------------------
    revno: 9639.1.2
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Mon 2008-08-25 21:47:00 +0200
    message:
      drop debug output, fix expected gnash results
    modified:
      testsuite/actionscript.all/MovieClip.as

=== modified file 'testsuite/actionscript.all/MovieClip.as'
--- a/testsuite/actionscript.all/MovieClip.as   2008-07-28 15:53:43 +0000
+++ b/testsuite/actionscript.all/MovieClip.as   2008-08-25 19:47:00 +0000
@@ -27,19 +27,19 @@
 endOfTest = function() 
 {
 #if OUTPUT_VERSION <= 5
-       check_totals(235); // SWF5
+       check_totals(233); // SWF5
 #endif
 
 #if OUTPUT_VERSION == 6
-       check_totals(659); // SWF6
+       check_totals(661); // SWF6
 #endif
 
 #if OUTPUT_VERSION == 7
-       check_totals(676); // SWF7
+       check_totals(678); // SWF7
 #endif
 
 #if OUTPUT_VERSION >= 8
-       check_totals(677); // SWF8+
+       check_totals(679); // SWF8+
 #endif
 
        play();
@@ -1567,7 +1567,13 @@
 {
        note("onData called, dataLoaded: "+dataLoaded);
        check_equals(arguments.length, 0);
+#if OUTPUT_VERSION > 5
        check_equals(_root.var1, 'val1');
+#else
+       // leading BOM confuses player 5 (but not gnash)
+       xcheck_equals(typeof(_root.var1), 'undefined');
+#endif
+       check_equals(_root.var2, 'val2');
        check_equals(_root.var3, 'val3\n');
        delete _root.var1; // = 'val1custom';
        delete _root.var2; // = 'val2custom';
@@ -1596,7 +1602,8 @@
        // neighter does onEnterFrame work..
        onDataCheck = function()
        {
-               if ( _root.var1 != undefined ) onData();
+               //note("1000 interval called");
+               if ( _root.var3 != undefined ) onData();
        };
        //dataLoadInterval = setInterval(onData, 1000);
        dataLoadInterval = setInterval(onDataCheck, 1000);