CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/10/05 11:26:01
Modified files:
. : ChangeLog
testsuite/misc-swfmill.all: Makefile.am jump_after_end.xml
Log message:
* testsuite/misc-swfmill.all/: Makefile.am, jump_after_end.xml:
Have the test end with an "END OF TEST" trace, and expect
that.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4537&r2=1.4538
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfmill.all/Makefile.am?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfmill.all/jump_after_end.xml?cvsroot=gnash&r1=1.3&r2=1.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4537
retrieving revision 1.4538
diff -u -b -r1.4537 -r1.4538
--- ChangeLog 5 Oct 2007 11:11:44 -0000 1.4537
+++ ChangeLog 5 Oct 2007 11:26:00 -0000 1.4538
@@ -1,5 +1,10 @@
2007-10-05 Sandro Santilli <[EMAIL PROTECTED]>
+ * testsuite/misc-swfmill.all/: Makefile.am, jump_after_end.xml:
+ Have the test end with an "END OF TEST" trace, and expect that.
+
+2007-10-05 Sandro Santilli <[EMAIL PROTECTED]>
+
* testsuite/generic-testrunner.sh: add support for consistency
checking (-c and -C switches)
* testsuite/misc-swfmill.all/Makefile.am: expect jump_after_end.swf
Index: testsuite/misc-swfmill.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfmill.all/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/misc-swfmill.all/Makefile.am 5 Oct 2007 11:11:44 -0000
1.6
+++ testsuite/misc-swfmill.all/Makefile.am 5 Oct 2007 11:26:01 -0000
1.7
@@ -43,8 +43,8 @@
jump_after_end-runner \
$(NULL)
-jump_after_end-runner: $(srcdir)/../generic-testrunner.sh jump_after_end.swf
- sh $< -r 50 -c PASSED $(top_builddir) jump_after_end.swf > $@
+jump_after_end-runner: $(srcdir)/../generic-testrunner.sh jump_after_end.swf
Makefile
+ sh $< -r 50 -c "END OF TEST" $(top_builddir) jump_after_end.swf > $@
chmod 755 $@
.xml.swf:
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-swfmill.all/jump_after_end.xml 5 Oct 2007 10:32:32
-0000 1.3
+++ testsuite/misc-swfmill.all/jump_after_end.xml 5 Oct 2007 11:26:01
-0000 1.4
@@ -9,11 +9,11 @@
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*
+ The only solution I found was 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.
+ is reached. The "end-of-test" patter is set in the Makefile.am
+ so if you change last trace from this test please update that
+ as well.
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
@@ -50,19 +50,21 @@
<!-- 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
+ we'll never get to a FAILED trace. To handle such cases we'll
check
+ for a final 'end-of-test' message to be seeked-for by the test
runner.
-->
- <BranchAlways byteOffset="15"/>
+ <BranchAlways byteOffset="29"/> <!-- 16 +13 for the push -->
<PushData>
<items>
+ <StackString value="END OF TEST"/>
<StackString value="jumpval"/>
</items>
</PushData>
<GetVariable/>
<Trace/>
+ <Trace/>
<EndAction/>
<PushData>
<items>
@@ -71,7 +73,7 @@
</items>
</PushData>
<SetVariable/>
- <BranchAlways byteOffset="-65"/>
+ <BranchAlways byteOffset="-79"/> <!-- 66 +13 for the push -->
<EndAction/>
</actions>
</DoAction>
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
