[Gnash-commit] gnash ChangeLog extensions/fileio/Makefile.am t...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/08 21:13:48

Modified files:
        .              : ChangeLog 
        extensions/fileio: Makefile.am 
        testsuite      : generic-testrunner.sh 

Log message:
                * extensions/fileio/Makefile.am: export GNASH_PLUGINS to the 
buil tree
                  when running the test program.
                * testsuite/generic-testrunner.sh: export any GNASH variable in 
the
                  environment, so to allow generic test runners to specify a 
plugin
                  dir, and eventually a GNASHRC file (when we add support for 
it).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3127&r2=1.3128
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/fileio/Makefile.am?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/generic-testrunner.sh?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3127
retrieving revision 1.3128
diff -u -b -r1.3127 -r1.3128
--- ChangeLog   8 May 2007 19:31:21 -0000       1.3127
+++ ChangeLog   8 May 2007 21:13:48 -0000       1.3128
@@ -1,5 +1,10 @@
 2007-05-08 Sandro Santilli <address@hidden>
 
+       * extensions/fileio/Makefile.am: export GNASH_PLUGINS to the buil tree
+         when running the test program.
+       * testsuite/generic-testrunner.sh: export any GNASH variable in the
+         environment, so to allow generic test runners to specify a plugin
+         dir, and eventually a GNASHRC file (when we add support for it).
        * Makefile.am (dumpconfig): add info about which extensions are being
          built (if not null extensions are scanned, would be better to 
          just report wheter extensions are buil or not instead..)

Index: extensions/fileio/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/fileio/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- extensions/fileio/Makefile.am       27 Feb 2007 01:07:07 -0000      1.3
+++ extensions/fileio/Makefile.am       8 May 2007 21:13:48 -0000       1.4
@@ -37,7 +37,6 @@
 
 AM_LDFLAGS =  \
        $(top_builddir)/libbase/libgnashbase.la \
-       $(top_builddir)/server/vm/libgnashvm.la \
        $(top_builddir)/backend/libgnashbackend.la \
        $(top_builddir)/server/libgnashserver.la \
        $(PTHREAD_LIBS) \
@@ -62,7 +61,7 @@
        $(RM) $(DESTDIR)$(pluginsdir)/*.a 
 
 test: $(srcdir)/../../testsuite/generic-testrunner.sh test.swf
-       sh $< $(top_builddir) test.swf > $@
+       GNASH_PLUGINS=$(PWD) sh $< $(top_builddir) test.swf > $@
        chmod +x $@
 
 test.swf: test.as

Index: testsuite/generic-testrunner.sh
===================================================================
RCS file: /sources/gnash/gnash/testsuite/generic-testrunner.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/generic-testrunner.sh     16 Apr 2007 12:31:02 -0000      1.7
+++ testsuite/generic-testrunner.sh     8 May 2007 21:13:48 -0000       1.8
@@ -34,8 +34,16 @@
 shift
 testfiles=$@
 
+echo "#!/bin/sh"
+echo
+
+echo "# Environment"
+env | grep GNASH | while read; do
+       echo "export ${REPLY}"
+done
+
 cat << EOF
-#!/bin/sh
+
 for t in ${testfiles}; do
        echo "NOTE: Running test \${t}"
        ${top_builddir}/utilities/gprocessor -r${runs} -f${advances} -v \${t} 
|| echo "FAILED: gprocessor returned an error while playing '\${t}'"