CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/10/20 10:19:52
Modified files:
. : ChangeLog
testsuite : Makefile.am
testsuite/actionscript.all: Makefile.am
Log message:
* testsuite/Makefile.am: fix MEDIADIR path (for gnashrc)
* testsuite/actionscript.all/Makefile.am: use testsuite/gnashrc
for running tests (so loads from MEDIADIR are allowed).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4658&r2=1.4659
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/Makefile.am?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Makefile.am?cvsroot=gnash&r1=1.79&r2=1.80
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4658
retrieving revision 1.4659
diff -u -b -r1.4658 -r1.4659
--- ChangeLog 20 Oct 2007 09:40:10 -0000 1.4658
+++ ChangeLog 20 Oct 2007 10:19:51 -0000 1.4659
@@ -1,5 +1,11 @@
2007-10-20 Sandro Santilli <[EMAIL PROTECTED]>
+ * testsuite/Makefile.am: fix MEDIADIR path (for gnashrc)
+ * testsuite/actionscript.all/Makefile.am: use testsuite/gnashrc
+ for running tests (so loads from MEDIADIR are allowed).
+
+2007-10-20 Sandro Santilli <[EMAIL PROTECTED]>
+
* testsuite/misc-ming.all/loadMovieTestRunner.cpp: allow loads from
MEDIADIR
* testsuite/actionscript.all/XML.as: test where onData is defined.
Index: testsuite/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- testsuite/Makefile.am 20 Oct 2007 09:27:41 -0000 1.44
+++ testsuite/Makefile.am 20 Oct 2007 10:19:52 -0000 1.45
@@ -49,10 +49,10 @@
$(CAIRO_CFLAGS) \
$(NULL)
-abs_mediadir = $(shell cd $(srcdir)/../media; pwd)
+abs_mediadir = $(shell cd $(srcdir)/media; pwd)
gnashrc: gnashrc.in
- sed -e 's#@@MEDIADIR@@#$(srcdir)/testsuite/media#g' $< > $@
+ sed -e 's#@@MEDIADIR@@#$(abs_mediadir)/#g' $< > $@
if ENABLE_MING
Index: testsuite/actionscript.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- testsuite/actionscript.all/Makefile.am 7 Sep 2007 12:25:40 -0000
1.79
+++ testsuite/actionscript.all/Makefile.am 20 Oct 2007 10:19:52 -0000
1.80
@@ -16,7 +16,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.79 2007/09/07 12:25:40 strk Exp $
+# $Id: Makefile.am,v 1.80 2007/10/20 10:19:52 strk Exp $
AUTOMAKE_OPTIONS = dejagnu
@@ -26,7 +26,8 @@
# so I take responsibility of dropping that for the moment...
if ENABLE_MING
-DEF_MAKESWF_FLAGS=-DMING_VERSION_CODE=$(MING_VERSION_CODE)
-DMEDIADIR='\"$(srcdir)/../media\"'
+abs_mediadir = $(shell cd $(srcdir)/../media; pwd)
+DEF_MAKESWF_FLAGS=-DMING_VERSION_CODE=$(MING_VERSION_CODE)
-DMEDIADIR='\"$(abs_mediadir)\"'
quickcheck_RUNNERS = \
alltests-v5-Runner \
@@ -269,39 +270,39 @@
@mv alltests.swf alltests-v8.swf
astests-v5-Runner: $(srcdir)/../generic-testrunner.sh $(ASTESTS_V5_OUT)
- sh $< $(top_builddir) $(ASTESTS_V5_OUT) > $@
+ GNASHRC="$(top_builddir)/testsuite/gnashrc" sh $< $(top_builddir)
$(ASTESTS_V5_OUT) > $@
chmod 755 $@
astests-v6-Runner: $(srcdir)/../generic-testrunner.sh $(ASTESTS_V6_OUT)
- sh $< $(top_builddir) $(ASTESTS_V6_OUT) > $@
+ GNASHRC="$(top_builddir)/testsuite/gnashrc" sh $< $(top_builddir)
$(ASTESTS_V6_OUT) > $@
chmod 755 $@
astests-v7-Runner: $(srcdir)/../generic-testrunner.sh $(ASTESTS_V7_OUT)
- sh $< $(top_builddir) $(ASTESTS_V7_OUT) > $@
+ GNASHRC="$(top_builddir)/testsuite/gnashrc" sh $< $(top_builddir)
$(ASTESTS_V7_OUT) > $@
chmod 755 $@
astests-v8-Runner: $(srcdir)/../generic-testrunner.sh $(ASTESTS_V8_OUT)
- sh $< $(top_builddir) $(ASTESTS_V8_OUT) > $@
+ GNASHRC="$(top_builddir)/testsuite/gnashrc" sh $< $(top_builddir)
$(ASTESTS_V8_OUT) > $@
chmod 755 $@
# This version runs all testcases in a single SWF targetted at player 5
alltests-v5-Runner: $(srcdir)/../generic-testrunner.sh alltests-v5.swf
- sh $< $(top_builddir) alltests-v5.swf > $@
+ GNASHRC="$(top_builddir)/testsuite/gnashrc" sh $< $(top_builddir)
alltests-v5.swf > $@
chmod 755 $@
# This version runs all testcases in a single SWF targetted at player 6
alltests-v6-Runner: $(srcdir)/../generic-testrunner.sh alltests-v6.swf
- sh $< $(top_builddir) alltests-v6.swf > $@
+ GNASHRC="$(top_builddir)/testsuite/gnashrc" sh $< $(top_builddir)
alltests-v6.swf > $@
chmod 755 $@
# This version runs all testcases in a single SWF targetted at player 7
alltests-v7-Runner: $(srcdir)/../generic-testrunner.sh alltests-v7.swf
- sh $< $(top_builddir) alltests-v7.swf > $@
+ GNASHRC="$(top_builddir)/testsuite/gnashrc" sh $< $(top_builddir)
alltests-v7.swf > $@
chmod 755 $@
# This version runs all testcases in a single SWF targetted at player 8
alltests-v8-Runner: $(srcdir)/../generic-testrunner.sh alltests-v8.swf
- sh $< $(top_builddir) alltests-v8.swf > $@
+ GNASHRC="$(top_builddir)/testsuite/gnashrc" sh $< $(top_builddir)
alltests-v8.swf > $@
chmod 755 $@
$(ASTESTS_V5_OUT) : $(ASTESTS) Dejagnu.swf
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
