CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/11/29 09:09:14
Modified files:
. : ChangeLog
testsuite : generic-testrunner.sh
testsuite/misc-mtasc.all: Dejagnu.as Makefile.am
Log message:
Enable consistency checking for mtasc-based tests
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5012&r2=1.5013
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/generic-testrunner.sh?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/Dejagnu.as?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/Makefile.am?cvsroot=gnash&r1=1.21&r2=1.22
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5012
retrieving revision 1.5013
diff -u -b -r1.5012 -r1.5013
--- ChangeLog 29 Nov 2007 08:44:11 -0000 1.5012
+++ ChangeLog 29 Nov 2007 09:09:13 -0000 1.5013
@@ -1,5 +1,14 @@
2007-11-29 Sandro Santilli <[EMAIL PROTECTED]>
+ * testsuite/generic-testrunner.sh:
+ print run test on consistency error.
+ * testsuite/misc-mtasc.all/Dejagnu.as: have Dejagnu.done() trace
+ __END_OF_TEST__ for consitency checking.
+ * testsuite/misc-mtasc.all/Makefile.am: enable consistency checking,
+ fix dependencies, account for incosistent tests.
+
+2007-11-29 Sandro Santilli <[EMAIL PROTECTED]>
+
* testsuite/misc-mtasc.all/: enum.as, exception.as, function_test.as,
hello.as, implementsOpTest.as, inheritance.as, super_test1.as:
Add total run test checking.
Index: testsuite/generic-testrunner.sh
===================================================================
RCS file: /sources/gnash/gnash/testsuite/generic-testrunner.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/generic-testrunner.sh 5 Oct 2007 11:11:44 -0000 1.11
+++ testsuite/generic-testrunner.sh 29 Nov 2007 09:09:13 -0000 1.12
@@ -66,9 +66,9 @@
if test "x${endtagpat}" != x; then
lasttrace=\`grep TRACE \${outlog} | tail -1 | sed 's/.*TRACE:
//'\`
if ! expr "\${lasttrace}" : '${endtagpat}' > /dev/null; then
- echo "${endtagexp}FAILED: consistency check: last trace
(\${lasttrace}) doesn't match pattern (${endtagpat})"
+ echo "${endtagexp}FAILED: consistency check: last trace
from run of test \${t} (\${lasttrace}) doesn't match pattern (${endtagpat})"
else
- echo "${endtagexp}PASSED: consistency check: last trace
(\${lasttrace}) matches pattern (${endtagpat})"
+ echo "${endtagexp}PASSED: consistency check: last trace
from run of test \${t} (\${lasttrace}) matches pattern (${endtagpat})"
fi
fi
rm \${outlog}
Index: testsuite/misc-mtasc.all/Dejagnu.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/Dejagnu.as,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-mtasc.all/Dejagnu.as 29 Nov 2007 08:32:39 -0000 1.4
+++ testsuite/misc-mtasc.all/Dejagnu.as 29 Nov 2007 09:09:13 -0000 1.5
@@ -153,6 +153,7 @@
static function done() {
printtotals();
+ trace("__END_OF_TEST__");
}
}
Index: testsuite/misc-mtasc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- testsuite/misc-mtasc.all/Makefile.am 27 Nov 2007 15:17:04 -0000
1.21
+++ testsuite/misc-mtasc.all/Makefile.am 29 Nov 2007 09:09:13 -0000
1.22
@@ -19,16 +19,21 @@
AUTOMAKE_OPTIONS = dejagnu
# These will get executed and parsed for test output
-ASTESTS = \
+SANE_ASTESTS = \
hello.as \
inheritance.as \
function_test.as \
enum.as \
exception.as \
levels.as \
- super_test1.as \
implementsOpTest.as \
$(NULL)
+# These ones are the ones for which consistency check fail
+BOGUS_ASTESTS = \
+ super_test1.as \
+ $(NULL)
+
+ASTESTS = $(SANE_ASTESTS) $(BOGUS_ASTESTS)
# These will get compiled to SWFs just as above, but will not be executed as a
test
@@ -45,16 +50,27 @@
MTASC_FLAGS = -version 6 -cp $(MTASC_CLASSPATH) -cp $(srcdir) -v -header
800:600:20
MTASC_CPP = $(CPP) -x c -P -I$(srcdir)
-ASTESTS_OUT = $(ASTESTS:.as=.swf)
+SANE_ASTESTS_OUT = $(SANE_ASTESTS:.as=.swf)
+BOGUS_ASTESTS_OUT = $(BOGUS_ASTESTS:.as=.swf)
+ASTESTS_OUT = $(SANE_ASTESTS_OUT) $(BOGUS_ASTESTS_OUT)
AUXMOVIES_OUT = $(AUXMOVIES:.as=.swf)
+$(ASTESTS_OUT) $(AUXMOVIES_OUT): Dejagnu.as check.as
+
+
TEST_DRIVERS = ../simple.exp
TEST_CASES = \
- alltests-runner
+ sanetests-runner \
+ bogustests-runner \
+ $(NULL)
+
+sanetests-runner: $(srcdir)/../generic-testrunner.sh $(SANE_ASTESTS_OUT)
$(AUXMOVIES_OUT) Makefile
+ sh $< -c __END_OF_TEST__ -r 50 $(top_builddir) $(SANE_ASTESTS_OUT) > $@
+ chmod 755 $@
-alltests-runner: $(srcdir)/../generic-testrunner.sh $(ASTESTS_OUT)
$(AUXMOVIES_OUT)
- sh $< -r 50 $(top_builddir) $(ASTESTS_OUT) > $@
+bogustests-runner: $(srcdir)/../generic-testrunner.sh $(BOGUS_ASTESTS_OUT)
$(AUXMOVIES_OUT) Makefile
+ sh $< -C __END_OF_TEST__ -r 50 $(top_builddir) $(BOGUS_ASTESTS_OUT) > $@
chmod 755 $@
.as.swf:
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
