[Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/Dejagnu...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/06 15:19:11

Modified files:
        .              : ChangeLog 
        testsuite/misc-swfc.all: Dejagnu.sc Makefile.am 
                                 gotoFrameFromInterval.sc sound.sc 

Log message:
        Add consistency checking to swfc-based testing framework

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5100&r2=1.5101
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Dejagnu.sc?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/gotoFrameFromInterval.sc?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/sound.sc?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5100
retrieving revision 1.5101
diff -u -b -r1.5100 -r1.5101
--- ChangeLog   6 Dec 2007 14:59:45 -0000       1.5100
+++ ChangeLog   6 Dec 2007 15:19:10 -0000       1.5101
@@ -1,3 +1,14 @@
+2007-12-06 Sandro Santilli <address@hidden>
+
+       * testsuite/misc-swfc.all/Dejagnu.sc: print __END_OF_TEST__ 
+         and fscommand:quit in done(), call this.done() from totals()
+         and xtotals().
+       * testsuite/misc-swfc.all/Makefile.am: add consistency checks
+         for tests.
+       * testsuite/misc-swfc.all/: sound.sc, gotoFrameFromInterval.sc:
+         Don't include check.sc, let Dejagnu.sc do that to avoid symbols
+         redefinition.
+
 2007-12-06 Udo Giacomozzi <address@hidden>
 
        * gui/fb.{h,cpp}: switch to graphics mode (and back) to get rid

Index: testsuite/misc-swfc.all/Dejagnu.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Dejagnu.sc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/misc-swfc.all/Dejagnu.sc  6 Dec 2007 10:40:00 -0000       1.10
+++ testsuite/misc-swfc.all/Dejagnu.sc  6 Dec 2007 15:19:10 -0000       1.11
@@ -79,6 +79,7 @@
                     this.xtrace('#expected failures: '+ this.xfailed);
                 }
            
+               this.done();
             },
 
             xtotals: function (expectedTestsRun, msg) {
@@ -111,6 +112,7 @@
                     this.xtrace('#expected failures: '+ this.xfailed);
                 }
            
+               this.done();
             },
 
             check_equals: function (obt, exp, msg, expression) {
@@ -162,8 +164,9 @@
             },
 
             done: function () {
-                this.totals();
                 _root.stop();
+               trace("__END_OF_TEST__");
+               loadMovie("fscommand:quit", _level0);
             }
 
         };

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- testsuite/misc-swfc.all/Makefile.am 6 Dec 2007 12:03:09 -0000       1.19
+++ testsuite/misc-swfc.all/Makefile.am 6 Dec 2007 15:19:11 -0000       1.20
@@ -19,7 +19,7 @@
 AUTOMAKE_OPTIONS = dejagnu
 
 # These will get executed and parsed for test output
-SCTESTS = \
+SANE_SCTESTS = \
        hello.sc \
        sound.sc \
        soft_reference_test1.sc \
@@ -34,6 +34,10 @@
        opcode_guard_test2.sc \
        swf4opcode.sc \
        mouse_drag_test.sc \
+       $(NULL)
+
+# These ones are the ones for which consistency check fail 
+BOGO_SCTESTS = \
        gotoFrameFromInterval.sc \
        $(NULL)
 
@@ -53,16 +57,23 @@
 SWFC_FLAGS = 
 SWFC_CPP = cpp -P -I$(srcdir) -DMEDIADIR='$(abs_mediadir)'
 
-SCTESTS_OUT = $(SCTESTS:.sc=.swf)
+SANE_SCTESTS_OUT = $(SANE_SCTESTS:.sc=.swf)
+BOGO_SCTESTS_OUT = $(BOGO_SCTESTS:.sc=.swf)
+SCTESTS_OUT = $(SANE_SCTESTS_OUT) $(BOGO_SCTESTS_OUT)
 
 AUXMOVIES_OUT = $(AUXMOVIES:.sc=.swf)
 
 TEST_DRIVERS = ../simple.exp
 TEST_CASES = \
-       alltests-runner
+       sanetests-runner \
+       bogustests-runner
+
+sanetests-runner: $(srcdir)/../generic-testrunner.sh $(SANE_SCTESTS_OUT) 
$(AUXMOVIES_OUT) Makefile
+       sh $< -c __END_OF_TEST__ -f 50 -r 50 $(top_builddir) 
$(SANE_SCTESTS_OUT) > $@
+       chmod 755 $@
 
-alltests-runner: $(srcdir)/../generic-testrunner.sh $(SCTESTS_OUT) 
$(AUXMOVIES_OUT) Makefile
-       sh $< -f 50 -r 50 $(top_builddir) $(SCTESTS_OUT) > $@
+bogustests-runner: $(srcdir)/../generic-testrunner.sh $(BOGO_SCTESTS_OUT) 
$(AUXMOVIES_OUT) Makefile
+       sh $< -C __END_OF_TEST__ -f 50 -r 50 $(top_builddir) 
$(BOGO_SCTESTS_OUT) > $@
        chmod 755 $@
 
 *.swf: Dejagnu.sc check.sc

Index: testsuite/misc-swfc.all/gotoFrameFromInterval.sc
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-swfc.all/gotoFrameFromInterval.sc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-swfc.all/gotoFrameFromInterval.sc    6 Dec 2007 13:12:07 
-0000       1.2
+++ testsuite/misc-swfc.all/gotoFrameFromInterval.sc    6 Dec 2007 15:19:11 
-0000       1.3
@@ -1,8 +1,5 @@
 .flash bbox=200x200 filename="gotoandplay_stop.swf" version=6 fps=10
 
-#include "check.sc"
-
-
 .frame 1
     .action:
 #include "Dejagnu.sc"
@@ -15,7 +12,7 @@
 
     stop();
     
-    note("starting! ($Id: gotoFrameFromInterval.sc,v 1.2 2007/12/06 13:12:07 
udog Exp $)");
+    note("starting! ($Id: gotoFrameFromInterval.sc,v 1.3 2007/12/06 15:19:11 
strk Exp $)");
     
     function doit() {
       note("now jumping...");
@@ -36,7 +33,8 @@
             check_equals(_root._currentframe, 5);
             note("Test done");
 
-            Dejagnu.done();
+           totals(1);
+            //Dejagnu.done();
             
             // BUG NOTICE: jumping to frame 10 makes Gnash restart the movie
             // even with the -1 switch!

Index: testsuite/misc-swfc.all/sound.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/sound.sc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-swfc.all/sound.sc    10 Aug 2007 18:59:34 -0000      1.2
+++ testsuite/misc-swfc.all/sound.sc    6 Dec 2007 15:19:11 -0000       1.3
@@ -1,16 +1,16 @@
 .flash bbox=200x200 filename="sound_test.swf" version=6 fps=30
 
-#include "check.sc"
-
-.sound audio MEDIA(sound1.wav)
-
 .box b1 100 100 color=yellow fill=red
 
 .frame 1
+
     .action:
 #include "Dejagnu.sc"
     .end
 
+.sound audio MEDIA(sound1.wav)
+
+
 .frame 2
        .put b1 pin=center scale=0%
        .action:
@@ -21,7 +21,9 @@
                trace("Sound duration is: ");
                trace(snd.duration);
                trace("Correct value should be 13740");
-                check_equals(snd.duration, 13740);
+               // fails due to missing sound handler when using gprocessor
+               // TODO: use gnash or register a sound handler with gprocessor !
+                xcheck_equals(snd.duration, 13740);
        
                trace("Now I'll get the position before starting it");
                sndpos=snd.position;
@@ -49,7 +51,7 @@
 
 .frame 8
        .action:
-                Dejagnu.done();
+               totals(2);
                snd.stop();
        .end
        .stop