[Gnash-commit] gnash ChangeLog testsuite/misc-swfmill.all/jump...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/05 10:32:32

Modified files:
        .              : ChangeLog 
        testsuite/misc-swfmill.all: jump_after_end.xml 

Log message:
                * testsuite/misc-swfmill.all/jump_after_end.xml: Made the
                  self-contained (almost completely). The problem now is that
                  if it fails it will NOT print nor FAILED nor PASSED so
                  we'll need the test *runner* to implement some sort of
                  consistency check to verify the end of test is reached.
                  We should do this always, btw...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4535&r2=1.4536
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfmill.all/jump_after_end.xml?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4535
retrieving revision 1.4536
diff -u -b -r1.4535 -r1.4536
--- ChangeLog   5 Oct 2007 09:52:16 -0000       1.4535
+++ ChangeLog   5 Oct 2007 10:32:31 -0000       1.4536
@@ -1,5 +1,14 @@
 2007-10-05 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-swfmill.all/jump_after_end.xml: Made the
+         self-contained (almost completely). The problem now is that
+         if it fails it will NOT print nor FAILED nor PASSED so
+         we'll need the test *runner* to implement some sort of
+         consistency check to verify the end of test is reached.
+         We should do this always, btw...
+
+2007-10-05 Sandro Santilli <address@hidden>
+
        * testsuite/misc-swfmill.all/jump_after_end.xml:
          Fixed the XML to *really* do what I intended it to
          do. Still not self-contained though.

Index: testsuite/misc-swfmill.all/jump_after_end.xml
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfmill.all/jump_after_end.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-swfmill.all/jump_after_end.xml       5 Oct 2007 09:52:16 
-0000       1.2
+++ testsuite/misc-swfmill.all/jump_after_end.xml       5 Oct 2007 10:32:32 
-0000       1.3
@@ -2,16 +2,24 @@
 <swf version="6" compressed="1">
 
 <!--
-This test checks if you can jump after the end opcode in a doaction block
 
-EXPECTED OUTPUT:
-   - TRACE: jump target
+ This file wants to test if branch after END opcode is allowed.
 
-TODO:
-  - Find out how to embed the Dejagnu.swf lib
-  - Find out how to call the Dejagnu.swf interfaces
--->
+ It is hard to make it self-contained as if the branch fails
+ we'll loose control over the execution so nothing will be 
+ traced.  Tracing successes is fined.
+
+ The only solution I can think of is making the test *runner* 
+ aware of what signals end of test, and verify the end of test
+ is reached. This should be easy to implement, except producing
+ these XML files takes a bit of time due to hard-to-compute offsets
+ to branch to.
+
+ The best way I found to modify this file is to use flasm, edit
+ the code there, then change back to XML and add the END tag when
+ needed (flasm is unable to add END tags in the middle of an action)
 
+-->
 
   <Header framerate="12" frames="1">
     <size>
@@ -27,23 +35,43 @@
         <actions>
           <PushData>
             <items>
-              <StackInteger value="1"/>
+              <StackString value="Check if branch after end is allowed"/>
             </items>
           </PushData>
          <Trace/>
+          <PushData>
+            <items>
+              <StackString value="jumpval"/>
+              <!-- NOTE: we'll never get to trace this in a real failure.. -->
+              <StackString value="FAILED: jump after NOT allowed"/>
+            </items>
+          </PushData>
+          <SetVariable/>
 
-         <!-- Now jump to after the END action -->
-          <BranchAlways byteOffset="1"/>
-
-          <EndAction/>
+          <!-- NOTE:
+               If the branch fails here (not allowed to jump after END opcode)
+               we'll never get to a FAILED trace. To handle such cases we 
should
+               trace a final 'end-of-test' message to be seeked-for by the test
+               runner.
+            -->
+          <BranchAlways byteOffset="15"/>
 
           <PushData>
             <items>
-              <StackString value="jump after end"/>
+              <StackString value="jumpval"/>
             </items>
           </PushData>
+          <GetVariable/>
           <Trace/>
-
+         <EndAction/>
+          <PushData>
+            <items>
+              <StackString value="jumpval"/>
+              <StackString value="PASSED: jump after end ALLOWED"/>
+            </items>
+          </PushData>
+          <SetVariable/>
+          <BranchAlways byteOffset="-65"/>
           <EndAction/>
         </actions>
       </DoAction>