[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog Makefile.am configure.ac testsu...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog Makefile.am configure.ac testsu... |
|
Date: |
Wed, 07 Mar 2007 15:11:24 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/03/07 15:11:24
Modified files:
. : ChangeLog Makefile.am configure.ac
testsuite : Makefile.am
testsuite/misc-ming.all: Makefile.am
testsuite/swfdec: README swfdec_gnash_tester
Added files:
testsuite/swfdec: .cvsignore Makefile.am PASSING
gen_run_swfdec_testsuite.sh
Log message:
Add --with-swfdec-testsuite switch to configure, enabling run
of
trace-based testsuite from swfdec to be run by 'make check'.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2565&r2=1.2566
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.269&r2=1.270
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/Makefile.am?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/README?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/swfdec_gnash_tester?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/.cvsignore?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/Makefile.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/gen_run_swfdec_testsuite.sh?cvsroot=gnash&rev=1.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2565
retrieving revision 1.2566
diff -u -b -r1.2565 -r1.2566
--- ChangeLog 7 Mar 2007 13:01:00 -0000 1.2565
+++ ChangeLog 7 Mar 2007 15:11:23 -0000 1.2566
@@ -1,3 +1,13 @@
+2007-03-07 Sandro Santilli <address@hidden>
+
+ * Makefile.am, configure.ac, testsuite/Makefile.am,
+ testsuite/misc-ming.all/Makefile.am, testsuite/swfdec/.cvsignore,
+ testsuite/swfdec/Makefile.am, testsuite/swfdec/PASSING,
+ testsuite/swfdec/README, testsuite/swfdec/gen_run_swfdec_testsuite.sh,
+ testsuite/swfdec/swfdec_gnash_tester:
+ Add --with-swfdec-testsuite switch to configure, enabling run of
+ trace-based testsuite from swfdec to be run by 'make check'.
+
2007-03-07 Udo Giacomozzi <address@hidden>
* backend/render_handler_agg.cpp: fixed segfault #19223; set correct
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- Makefile.am 6 Mar 2007 18:06:12 -0000 1.64
+++ Makefile.am 7 Mar 2007 15:11:24 -0000 1.65
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.64 2007/03/06 18:06:12 rsavoye Exp $
+# $Id: Makefile.am,v 1.65 2007/03/07 15:11:24 strk Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -221,12 +221,19 @@
@echo " CURL_LIBS is $(CURL_LIBS)"
@echo " BOOST_CFLAGS is $(BOOST_CFLAGS)"
@echo " BOOST_LIBS is $(BOOST_LIBS)"
+if ENABLE_MING
@echo " MING_VERSION_CODE $(MING_VERSION_CODE) "
@echo " MING_LIBS $(MING_LIBS) "
@echo " MING_CFLAGS $(MING_CFLAGS) "
@echo " MAKESWF $(MAKESWF) "
+endif
+if ENABLE_MTASC
@echo " MTASC $(MTASC)"
@echo " MTASC CLASSPATH $(MTASC_CLASSPATH)"
+endif
+if ENABLE_SWFDEC_TESTSUITE
+ @echo " SWFDEC_TESTSUITE $(SWFDEC_TESTSUITE)"
+endif
@echo "Graphics support..."
@echo " CAIRO_CFLAGS is $(CAIRO_CFLAGS)"
@echo " CAIRO_LIBS is $(CAIRO_LIBS)"
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -b -r1.269 -r1.270
--- configure.ac 6 Mar 2007 18:06:12 -0000 1.269
+++ configure.ac 7 Mar 2007 15:11:24 -0000 1.270
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.269 2007/03/06 18:06:12 rsavoye Exp $
+dnl $Id: configure.ac,v 1.270 2007/03/07 15:11:24 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -491,6 +491,13 @@
AC_PATH_MING
AM_CONDITIONAL(ENABLE_MING, [ test x"$MAKESWF" != x ])
+AC_ARG_WITH([swfdec_testsuite],
+ AC_HELP_STRING([--with-swfdec-testsuite],
+ [directory where swfdec testsuite (the 'test' dir) is]),
+ SWFDEC_TESTSUITE=${withval})
+AC_SUBST(SWFDEC_TESTSUITE)
+AM_CONDITIONAL(ENABLE_SWFDEC_TESTSUITE, [ test x"$SWFDEC_TESTSUITE" != x ])
+
AC_PATH_PROG(DOXYGEN, doxygen)
AM_CONDITIONAL(ENABLE_DOXYGEN, [ test x"$DOXYGEN" != x ])
@@ -868,6 +875,7 @@
testsuite/libgeometry/Makefile
testsuite/actionscript.all/Makefile
testsuite/samples/Makefile
+testsuite/swfdec/Makefile
testsuite/misc-ming.all/Makefile
testsuite/misc-mtasc.all/Makefile
testsuite/movies.all/Makefile
@@ -1420,6 +1428,10 @@
run anyway."
fi
+if test x"$SWFDEC_TESTSUITE" != x; then
+ echo " SWFDEC testsuite dir is $SWFDEC_TESTSUITE"
+fi
+
if test x"$MTASC" != x; then
echo " MTASC is $MTASC"
echo " MTASC CLASSPATH is $MTASC_CLASSPATH"
Index: testsuite/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- testsuite/Makefile.am 6 Mar 2007 18:06:12 -0000 1.31
+++ testsuite/Makefile.am 7 Mar 2007 15:11:24 -0000 1.32
@@ -3,6 +3,7 @@
# movies.all
SUBDIRS = \
. \
+ swfdec \
libbase \
libgeometry \
server \
Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- testsuite/misc-ming.all/Makefile.am 5 Mar 2007 10:07:39 -0000 1.76
+++ testsuite/misc-ming.all/Makefile.am 7 Mar 2007 15:11:24 -0000 1.77
@@ -702,5 +702,6 @@
@sed -e '/testcases/d' site.exp.bak > site.exp
@echo "# This is a list of the pre-compiled testcases" >> site.exp
@echo "set testcases \"$(TEST_CASES)\"" >> site.exp
+
endif
Index: testsuite/swfdec/README
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/swfdec/README 6 Mar 2007 17:46:36 -0000 1.1
+++ testsuite/swfdec/README 7 Mar 2007 15:11:24 -0000 1.2
@@ -1,5 +1,14 @@
-This directory is intended to be filled with Makefiles allowing
-run of the swfdec testsuite with Gnash.
-Currently there's only a simple stabbed tester for single movies,
-in the future I'd like to add a --with-swfdec-testsuite configure
-switch to run all tests as part of our 'make check' rule.
+2007-03-07
+
+This directory is contain scripts to run swfdec trace-based testsuite.
+
+The PASSING file is a list of SWF files in the testsuite which is expected to
pass,
+when new tests are added they'll be expected to fail by default.
+If you see an unexpected success you can add the name of the file to PASSING.
+
+You'll need to pass the --with-swfdec-testsuite switch to configure in order
+for swfdec tests to be run as part of the 'make check' rule.
+
+Have fun.
+
+--strk;
Index: testsuite/swfdec/swfdec_gnash_tester
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/swfdec_gnash_tester,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/swfdec/swfdec_gnash_tester 6 Mar 2007 21:37:42 -0000
1.3
+++ testsuite/swfdec/swfdec_gnash_tester 7 Mar 2007 15:11:24 -0000
1.4
@@ -14,8 +14,9 @@
out=`basename "${in}"`.trace-gnash
exp="${in}.trace"
-${GPROCESSOR} -r10 -v "$in" | grep TRACE | sed 's/.*TRACE: //' | fromdos >
$out
+${GPROCESSOR} -f10 -v "$in" | grep TRACE | sed 's/.*TRACE: //' | fromdos >
$out
if test "$?" != 0; then
+ echo "gprocessor returned an error"
exit 1
else
diff -u3 "$exp" "$out"
Index: testsuite/swfdec/.cvsignore
===================================================================
RCS file: testsuite/swfdec/.cvsignore
diff -N testsuite/swfdec/.cvsignore
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/swfdec/.cvsignore 7 Mar 2007 15:11:24 -0000 1.1
@@ -0,0 +1,8 @@
+Makefile.in
+Makefile
+gnash-dbg.log
+site.exp
+testrun.log
+testrun.sum
+*.trace-gnash
+*.log
Index: testsuite/swfdec/Makefile.am
===================================================================
RCS file: testsuite/swfdec/Makefile.am
diff -N testsuite/swfdec/Makefile.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/swfdec/Makefile.am 7 Mar 2007 15:11:24 -0000 1.1
@@ -0,0 +1,59 @@
+## Process this fill with automake to generate Makefile.in
+#
+# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+AUTOMAKE_OPTIONS = dejagnu
+
+abs_topbuilddir=$(shell cd $(top_builddir); pwd)
+
+if ENABLE_SWFDEC_TESTSUITE
+
+check_SCRIPTS = \
+ run_swfdec_testsuite
+
+clean-local:
+ rm -f $(check_SCRIPTS) \
+ *.log *.trace-gnash \
+ site.bak site.exp site.exp.bak testrun.sum \
+ gnash.sum
+
+run_swfdec_testsuite: $(srcdir)/gen_run_swfdec_testsuite.sh
+ sh $< $(abs_topbuilddir) $(srcdir) $(SWFDEC_TESTSUITE)/trace > $@
+ chmod 755 $@
+
+TEST_DRIVERS = ../simple.exp
+TEST_CASES = ${check_SCRIPTS}
+
+check-DEJAGNU: site-update $(check_PROGRAMS)
+ @runtest=$(RUNTEST); \
+ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
+ $$runtest $(RUNTESTFLAGS) $(TEST_DRIVERS); \
+ else \
+ echo "WARNING: could not find \`runtest'" 1>&2; \
+ for i in "$(TEST_CASES)"; do \
+ $(SHELL) $$i; \
+ done; \
+ fi
+
+site-update: site.exp
+ @rm -fr site.exp.bak
+ @cp site.exp site.exp.bak
+ @sed -e '/testcases/d' site.exp.bak > site.exp
+ @echo "# This is a list of the pre-compiled testcases" >> site.exp
+ @echo "set testcases \"$(TEST_CASES)\"" >> site.exp
+
+endif
Index: testsuite/swfdec/PASSING
===================================================================
RCS file: testsuite/swfdec/PASSING
diff -N testsuite/swfdec/PASSING
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/swfdec/PASSING 7 Mar 2007 15:11:24 -0000 1.1
@@ -0,0 +1,12 @@
+case1-6.swf
+case1-7.swf
+comparisons-5.swf
+comparisons-6.swf
+function-undefined.swf
+local.swf
+object-math-5.swf
+scope.swf
+scope2.swf
+setvariable.swf
+undefined1.swf
+undefined2-6.swf
Index: testsuite/swfdec/gen_run_swfdec_testsuite.sh
===================================================================
RCS file: testsuite/swfdec/gen_run_swfdec_testsuite.sh
diff -N testsuite/swfdec/gen_run_swfdec_testsuite.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/swfdec/gen_run_swfdec_testsuite.sh 7 Mar 2007 15:11:24
-0000 1.1
@@ -0,0 +1,68 @@
+#"
+# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+#!/bin/sh -x
+
+
+if [ -z "$3" ]; then
+ echo "Usage: `basename %0` <gnash_builddir> <gnash_srcdir>
<swfdec_tracedir>" >&2
+ exit 1
+fi
+
+BUILDDIR="$1"
+SRCDIR="$2"
+SWFDECTRACEDIR="$3"
+NOW=`date`
+
+GPROCESSOR="${BUILDDIR}/utilities/gprocessor"
+SWFDEC_GNASH_TESTER="${SRCDIR}/swfdec_gnash_tester"
+
+OUTPUTSCRIPT="${BUILDDIR}/testsuite/swfdec/run_swfdec_testsuite"
+
+cat<<EOF > "${OUTPUTSCRIPT}"
+#!/bin/sh
+
+# Generated by gen_run_swfdec_testsuite.sh on
+# $NOW
+
+export GPROCESSOR=${GPROCESSOR}
+EXPECTPASS=${SRCDIR}/PASSING
+
+for test in \`ls ${SWFDECTRACEDIR}/*.swf\`; do
+ testname=\`basename \${test}\`
+ expectpass=no
+ if grep -q \${testname} \${EXPECTPASS}; then
+ expectpass="yes"
+ fi
+ echo "NOTE: running \${testname} (expect pass: \${expectpass})"
+ if ${SWFDEC_GNASH_TESTER} \${test} > \${testname}.log; then
+ if [ "\${expectpass}" = "yes" ]; then
+ echo "PASSED: \${test}"
+ else
+ echo "XPASSED: \${test}"
+ fi
+ else
+ if [ "\${expectpass}" = "yes" ]; then
+ echo "FAILED: \${testname} (traces in
\${testname}.trace-gnash, log in \${testname}.log)"
+ else
+ echo "XFAILED: \${testname} (traces in
\${testname}.trace-gnash, log in \${testname}.log)"
+ fi
+ fi
+done
+
+EOF
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog Makefile.am configure.ac testsu...,
Sandro Santilli <=