[Gnash-commit] [SCM] Gnash branch, master, updated. 2456bf411d8538fbfffd353419461a7820476850

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  2456bf411d8538fbfffd353419461a7820476850 (commit)
       via  92d1a7d87cddffa45c5b61d07ffc0cc7dd8115ca (commit)
      from  ab3312cb798e2e2d1d6254b0a3e929c57a12d803 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=2456bf411d8538fbfffd353419461a7820476850


commit 2456bf411d8538fbfffd353419461a7820476850
Merge: 92d1a7d ab3312c
Author: Sandro Santilli <address@hidden>
Date:   Mon Nov 15 21:47:43 2010 +0100

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=92d1a7d87cddffa45c5b61d07ffc0cc7dd8115ca


commit 92d1a7d87cddffa45c5b61d07ffc0cc7dd8115ca
Author: Sandro Santilli <address@hidden>
Date:   Mon Nov 15 21:39:35 2010 +0100

    Put tests for loading under a misc-ming.all/loading dir

diff --git a/configure.ac b/configure.ac
index 57de852..d4262c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2845,6 +2845,7 @@ testsuite/misc-ming.all/Makefile
 testsuite/misc-ming.all/action_order/Makefile
 testsuite/misc-ming.all/displaylist_depths/Makefile
 testsuite/misc-ming.all/loop/Makefile
+testsuite/misc-ming.all/loading/Makefile
 testsuite/misc-mtasc.all/Makefile
 testsuite/misc-haxe.all/Makefile
 testsuite/misc-haxe.all/classes.all/Makefile
diff --git a/testsuite/misc-ming.all/Makefile.am 
b/testsuite/misc-ming.all/Makefile.am
index 74ec448..f542471 100644
--- a/testsuite/misc-ming.all/Makefile.am
+++ b/testsuite/misc-ming.all/Makefile.am
@@ -28,7 +28,7 @@ CLEANFILES =  \
        testrun.sum \
        testrun.log
 
-SUBDIRS = loop displaylist_depths action_order
+SUBDIRS = loop loading displaylist_depths action_order
 
 EXTRA_DIST = \
        empty.as \
@@ -106,7 +106,6 @@ check_PROGRAMS = \
        RollOverOutTest \
        RollOverOutTest-Runner \
        definebitsjpeg2 \
-       moviecliploader_test \
        spritehier \
        timeline_var_test \
        root_stop_test \
@@ -133,9 +132,6 @@ check_PROGRAMS = \
        multi_doactions_and_goto_frame_test \
        reverse_execute_PlaceObject2_test1 \
        reverse_execute_PlaceObject2_test2 \
-       loadImageTest \
-       loadMovieTest \
-       loadMovieTestRunner \
        DrawingApiTestRunner \
        frame_label_test \
        path_format_test \
@@ -150,7 +146,6 @@ check_PROGRAMS = \
        static_vs_dynamic2 \
        getTimer_test \
        Video-EmbedSquareTest \
-       LoadVarsTest \
        Video-EmbedSquareTestRunner \
        NetStream-SquareTest \
        NetStream-SquareTestRunner \
@@ -167,12 +162,6 @@ check_PROGRAMS = \
        BitmapDataDraw \
        $(NULL)
        
-if MING_VERSION_0_4_4
-check_PROGRAMS += \
-       LoadBitmapTest \
-       $(NULL)
-endif
-
 if MING_VERSION_0_4_3
 check_PROGRAMS += \
        EmbeddedSoundTest \
@@ -264,7 +253,6 @@ check_SCRIPTS = \
        getTimer_testrunner \
        DepthLimitsTestrunner \
        shape_testrunner \
-       LoadVarsTestRunner \
        DefineEditTextVariableNameTest-Runner \
        DefineEditTextVariableNameTest2-Runner \
        runtime_vm_stack_testrunner \
@@ -274,12 +262,6 @@ check_SCRIPTS = \
        InitActionTest2Runner \
        $(NULL)
        
-if MING_VERSION_0_4_4
-check_SCRIPTS += \
-       LoadBitmapTestRunner \
-       $(NULL)
-endif
-
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
 check_SCRIPTS += VarAndCharClashTest-Runner \
        gotoFrame2Test-Runner \
@@ -337,20 +319,6 @@ definebitsjpeg2_LDADD = $(MING_LIBS)
 definebitsjpeg2.swf: definebitsjpeg2
        ./definebitsjpeg2 $(srcdir)/../media/lynch.jpg
 
-moviecliploader_test_SOURCES =  moviecliploader_test.c
-moviecliploader_test_LDADD = $(MING_LIBS)
-
-#FIXME: make this rule consistent with the others 
-#and write a test runner for the absolute *and* relative
-#versions
-moviecliploader_tests: moviecliploader_test
-       : test with relative urls 
-       ln -fs $(abs_mediadir) media
-       ./moviecliploader_test media
-       mv moviecliploader_test.swf moviecliploader_test_relative.swf
-       : test absolute url
-       ./moviecliploader_test $(abs_mediadir)
-
 DefineTextTest.swf: DefineTextTest
        ./DefineTextTest $(abs_mediadir)
 
@@ -1120,23 +1088,6 @@ BitmapDataDrawRunner: $(srcdir)/../generic-testrunner.sh 
BitmapDataDraw.swf
        sh $< $(top_builddir) BitmapDataDraw.swf > $@
        chmod 755 $@
 
-LoadBitmapTest_SOURCES = \
-       LoadBitmapTest.c \
-       $(NULL)
-
-LoadBitmapTest_CFLAGS = \
-       -DMEDIADIR='"$(abs_mediadir)"' \
-       $(NULL)
-
-LoadBitmapTest_LDADD = libgnashmingutils.la
-
-LoadBitmapTest.swf: LoadBitmapTest
-       ./LoadBitmapTest $(abs_mediadir)
-
-LoadBitmapTestRunner: $(srcdir)/../generic-testrunner.sh LoadBitmapTest.swf
-       sh $< $(top_builddir) LoadBitmapTest.swf > $@
-       chmod 755 $@
-
 BeginBitmapFill_SOURCES = \
        BeginBitmapFill.c \
        $(NULL)
@@ -1343,47 +1294,6 @@ ResolveEventsTest_Runner_CXXFLAGS = \
        -DTGTDIR='"$(abs_builddir)"' \
        $(NULL)
 
-loadImageTest_SOURCES =        \
-       loadImageTest.c \
-       $(NULL)
-loadImageTest_LDADD = libgnashmingutils.la
-loadImageTest.swf: loadImageTest
-       ./loadImageTest $(abs_mediadir)
-
-loadMovieTest_SOURCES =        \
-       loadMovieTest.c \
-       $(NULL)
-loadMovieTest_LDADD = libgnashmingutils.la
-loadMovieTest.swf: loadMovieTest
-       ./loadMovieTest $(abs_mediadir)
-loadMovieTestRunner_SOURCES = \
-       loadMovieTestRunner.cpp \
-       $(NULL)
-loadMovieTestRunner_LDADD = \
-       $(top_builddir)/testsuite/libtestsuite.la \
-       $(AM_LDFLAGS) \
-       $(NULL)
-loadMovieTestRunner_CXXFLAGS = \
-       -DSRCDIR='"$(srcdir)"' \
-       -DTGTDIR='"$(abs_builddir)"' \
-       -DMEDIADIR='"$(abs_mediadir)"' \
-       $(NULL)
-loadMovieTestRunner_DEPENDENCIES = \
-       loadMovieTest.swf \
-       $(top_builddir)/testsuite/libtestsuite.la \
-       $(NULL)
-
-#loadMovieTest_Runner_SOURCES = \
-#      loadMovieTest-Runner.cpp \
-#      $(NULL)
-#loadMovieTest_Runner_LDADD = \
-#      $(top_builddir)/testsuite/libtestsuite.la \
-#      $(NULL)
-#loadMovieTest_Runner_DEPENDENCIES = \
-#      $(top_builddir)/testsuite/libtestsuite.la \
-#      loadMovieTest.swf       \
-#      $(NULL)
-
 # This will only work with Ming-0.4.0beta2 (support for prebuilt clips 
inclusion)
 VarAndCharClashTest.swf: $(srcdir)/../media/green.swf Dejagnu.swf 
$(srcdir)/VarAndCharClashTest.as 
        $(MAKESWF) -o $@ Dejagnu.swf $(srcdir)/../media/green.swf 
$(srcdir)/VarAndCharClashTest.as
@@ -1701,20 +1611,6 @@ Video_EmbedSquareTestRunner_DEPENDENCIES = \
        Video-EmbedSquareTest.swf       \
        $(NULL)
 
-LoadVarsTest_SOURCES = \
-       LoadVarsTest.c \
-       $(NULL)
-
-LoadVarsTest_LDADD = libgnashmingutils.la
-
-LoadVarsTest.swf: LoadVarsTest
-       ./LoadVarsTest $(abs_mediadir)
-
-LoadVarsTestRunner: $(srcdir)/../generic-testrunner.sh LoadVarsTest.swf
-       sh $< $(top_builddir) LoadVarsTest.swf > $@
-       chmod 755 $@
-
-
 instanceNameTest_SOURCES =     \
        instanceNameTest.c      \
        $(NULL)
@@ -1743,7 +1639,6 @@ TEST_CASES = \
        BeginBitmapFillRunner \
        BitmapDataTestRunner \
        BitmapDataDrawRunner \
-       LoadVarsTestRunner \
        DeviceFontTestRunner \
        EmbeddedFontTestRunner \
        DefineEditTextVariableNameTest-Runner \
@@ -1767,7 +1662,6 @@ TEST_CASES = \
        consecutive_goto_frame_testrunner \
        multi_doactions_and_goto_frame_testrunner \
        registerClassTestRunner \
-       loadMovieTestRunner \
        XMLSocketTester \
        LCTestRunner \
        DrawingApiTestRunner \
@@ -1854,12 +1748,6 @@ TEST_CASES += \
        $(NULL)
 endif
 
-if MING_VERSION_0_4_4
-TEST_CASES += \
-       LoadBitmapTestRunner \
-       $(NULL)
-endif
-
 check-DEJAGNU: site-update $(check_PROGRAMS)
        @runtest=$(RUNTEST); \
        if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
diff --git a/testsuite/misc-ming.all/LoadBitmapTest.c 
b/testsuite/misc-ming.all/loading/LoadBitmapTest.c
similarity index 100%
rename from testsuite/misc-ming.all/LoadBitmapTest.c
rename to testsuite/misc-ming.all/loading/LoadBitmapTest.c
diff --git a/testsuite/misc-ming.all/LoadVarsTest.c 
b/testsuite/misc-ming.all/loading/LoadVarsTest.c
similarity index 100%
rename from testsuite/misc-ming.all/LoadVarsTest.c
rename to testsuite/misc-ming.all/loading/LoadVarsTest.c
diff --git a/testsuite/misc-ming.all/loading/Makefile.am 
b/testsuite/misc-ming.all/loading/Makefile.am
new file mode 100644
index 0000000..ce64610
--- /dev/null
+++ b/testsuite/misc-ming.all/loading/Makefile.am
@@ -0,0 +1,201 @@
+## Process this file with automake to generate Makefile.in
+# 
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 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 3 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 -Wno-portability
+
+abs_top_builddir=$(shell cd $(top_builddir); pwd)
+abs_builddir=$(shell cd $(top_builddir)/testsuite/misc-ming.all/loading; pwd)
+abs_mediadir = $(shell cd $(srcdir)/../../media; pwd)
+
+CLEANFILES =  \
+       gnash-dbg.log \
+       site.exp.bak \
+       testrun.sum \
+       testrun.log
+
+EXTRA_DIST = \
+       $(NULL)
+
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/libbase \
+       -I$(top_srcdir)/libmedia \
+       -I$(top_srcdir)/libsound \
+       -I$(top_srcdir)/librender \
+       -I$(top_srcdir)/libcore  \
+       -I$(top_srcdir)/libcore/swf  \
+       -I$(top_srcdir)/libcore/parser  \
+       -I$(top_srcdir)/libcore/vm \
+       -I$(top_srcdir)/libcore/asobj \
+       -I$(top_srcdir)/testsuite \
+       -I$(top_srcdir)/testsuite/misc-ming.all \
+       $(MING_CFLAGS) \
+       $(OPENGL_CFLAGS) \
+       $(BOOST_CFLAGS) \
+       -DMING_VERSION_CODE=$(MING_VERSION_CODE) \
+       $(NULL)
+
+AM_LDFLAGS = \
+       $(MING_LIBS) \
+       $(OPENGL_LIBS) \
+       $(GIF_LIBS) \
+       $(top_builddir)/libbase/libgnashbase.la \
+       $(top_builddir)/librender/libgnashrender.la \
+       $(NULL)
+
+if LIBLTDL2
+AM_LDFLAGS  += $(top_builddir)/libltdl/libltdlc.la
+endif
+if LIBLTDL1
+AM_LDFLAGS += $(top_builddir)/libbase/libltdlc.la
+endif
+
+check_PROGRAMS = \
+       moviecliploader_test \
+       loadImageTest \
+       loadMovieTest \
+       loadMovieTestRunner \
+       LoadVarsTest \
+       $(NULL)
+
+if MING_VERSION_0_4_4
+check_PROGRAMS += \
+       LoadBitmapTest \
+       $(NULL)
+endif
+
+       
+check_SCRIPTS = \
+       LoadVarsTestRunner \
+       $(NULL)
+
+if MING_VERSION_0_4_4
+check_SCRIPTS += \
+       LoadBitmapTestRunner \
+       $(NULL)
+endif
+       
+moviecliploader_test_SOURCES =  moviecliploader_test.c
+moviecliploader_test_LDADD = $(MING_LIBS)
+
+#FIXME: make this rule consistent with the others 
+#and write a test runner for the absolute *and* relative
+#versions
+moviecliploader_tests: moviecliploader_test
+       : test with relative urls 
+       ln -fs $(abs_mediadir) media
+       ./moviecliploader_test media
+       mv moviecliploader_test.swf moviecliploader_test_relative.swf
+       : test absolute url
+       ./moviecliploader_test $(abs_mediadir)
+
+LoadBitmapTest_SOURCES = \
+       LoadBitmapTest.c \
+       $(NULL)
+
+LoadBitmapTest_CFLAGS = \
+       -DMEDIADIR='"$(abs_mediadir)"' \
+       $(NULL)
+
+LoadBitmapTest_LDADD = ../libgnashmingutils.la
+
+LoadBitmapTest.swf: LoadBitmapTest
+       ./LoadBitmapTest $(abs_mediadir)
+
+LoadBitmapTestRunner: $(srcdir)/../../generic-testrunner.sh LoadBitmapTest.swf
+       sh $< $(top_builddir) LoadBitmapTest.swf > $@
+       chmod 755 $@
+
+loadImageTest_SOURCES =        \
+       loadImageTest.c \
+       $(NULL)
+loadImageTest_LDADD = ../libgnashmingutils.la
+loadImageTest.swf: loadImageTest
+       ./loadImageTest $(abs_mediadir)
+
+loadMovieTest_SOURCES =        \
+       loadMovieTest.c \
+       $(NULL)
+loadMovieTest_LDADD = ../libgnashmingutils.la
+loadMovieTest.swf: loadMovieTest
+       ./loadMovieTest $(abs_mediadir)
+loadMovieTestRunner_SOURCES = \
+       loadMovieTestRunner.cpp \
+       $(NULL)
+loadMovieTestRunner_LDADD = \
+       $(top_builddir)/testsuite/libtestsuite.la \
+       $(AM_LDFLAGS) \
+       $(NULL)
+loadMovieTestRunner_CXXFLAGS = \
+       -DSRCDIR='"$(srcdir)"' \
+       -DTGTDIR='"$(abs_builddir)"' \
+       -DMEDIADIR='"$(abs_mediadir)"' \
+       $(NULL)
+loadMovieTestRunner_DEPENDENCIES = \
+       loadMovieTest.swf \
+       $(top_builddir)/testsuite/libtestsuite.la \
+       $(NULL)
+
+LoadVarsTest_SOURCES = \
+       LoadVarsTest.c \
+       $(NULL)
+
+LoadVarsTest_LDADD = ../libgnashmingutils.la
+
+LoadVarsTest.swf: LoadVarsTest
+       ./LoadVarsTest $(abs_mediadir)
+
+LoadVarsTestRunner: $(srcdir)/../../generic-testrunner.sh LoadVarsTest.swf
+       sh $< $(top_builddir) LoadVarsTest.swf > $@
+       chmod 755 $@
+
+
+
+clean-local: 
+       -rm *.swf *.pp *unner
+
+TEST_DRIVERS = ../../simple.exp
+TEST_CASES = \
+       loadMovieTestRunner \
+       LoadVarsTestRunner \
+       $(NULL)
+
+if MING_VERSION_0_4_4
+TEST_CASES += \
+       LoadBitmapTestRunner \
+       $(NULL)
+endif
+
+
+check-DEJAGNU: site-update $(check_PROGRAMS)
+       @runtest=$(RUNTEST); \
+       if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
+           GNASH_GC_TRIGGER_THRESHOLD=0 GNASHRC=../../gnashrc $$runtest 
$(RUNTESTFLAGS) $(TEST_DRIVERS); true; \
+       else \
+         echo "WARNING: could not find \`runtest'" 1>&2; \
+          for i in "$(TEST_CASES)"; do \
+           GNASH_GC_TRIGGER_THRESHOLD=0 GNASHRC=../../gnashrc $(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
+
diff --git a/testsuite/misc-ming.all/loadImageTest.c 
b/testsuite/misc-ming.all/loading/loadImageTest.c
similarity index 100%
rename from testsuite/misc-ming.all/loadImageTest.c
rename to testsuite/misc-ming.all/loading/loadImageTest.c
diff --git a/testsuite/misc-ming.all/loadMovieTest.c 
b/testsuite/misc-ming.all/loading/loadMovieTest.c
similarity index 100%
rename from testsuite/misc-ming.all/loadMovieTest.c
rename to testsuite/misc-ming.all/loading/loadMovieTest.c
diff --git a/testsuite/misc-ming.all/loadMovieTestRunner.cpp 
b/testsuite/misc-ming.all/loading/loadMovieTestRunner.cpp
similarity index 100%
rename from testsuite/misc-ming.all/loadMovieTestRunner.cpp
rename to testsuite/misc-ming.all/loading/loadMovieTestRunner.cpp
diff --git a/testsuite/misc-ming.all/moviecliploader_test.c 
b/testsuite/misc-ming.all/loading/moviecliploader_test.c
similarity index 100%
rename from testsuite/misc-ming.all/moviecliploader_test.c
rename to testsuite/misc-ming.all/loading/moviecliploader_test.c

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                                       |    1 +
 testsuite/misc-ming.all/Makefile.am                |  114 +-----------
 .../misc-ming.all/{ => loading}/LoadBitmapTest.c   |    0
 .../misc-ming.all/{ => loading}/LoadVarsTest.c     |    0
 testsuite/misc-ming.all/loading/Makefile.am        |  201 ++++++++++++++++++++
 .../misc-ming.all/{ => loading}/loadImageTest.c    |    0
 .../misc-ming.all/{ => loading}/loadMovieTest.c    |    0
 .../{ => loading}/loadMovieTestRunner.cpp          |    0
 .../{ => loading}/moviecliploader_test.c           |    0
 9 files changed, 203 insertions(+), 113 deletions(-)
 rename testsuite/misc-ming.all/{ => loading}/LoadBitmapTest.c (100%)
 rename testsuite/misc-ming.all/{ => loading}/LoadVarsTest.c (100%)
 create mode 100644 testsuite/misc-ming.all/loading/Makefile.am
 rename testsuite/misc-ming.all/{ => loading}/loadImageTest.c (100%)
 rename testsuite/misc-ming.all/{ => loading}/loadMovieTest.c (100%)
 rename testsuite/misc-ming.all/{ => loading}/loadMovieTestRunner.cpp (100%)
 rename testsuite/misc-ming.all/{ => loading}/moviecliploader_test.c (100%)


hooks/post-receive
-- 
Gnash