[Gnash-commit] gnash ChangeLog testsuite/libbase/Makefile.am t...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/10/12 23:44:20

Modified files:
        .              : ChangeLog 
        testsuite/libbase: Makefile.am 
        testsuite/server: Makefile.am server.exp 

Log message:
                * testsuite/libbase/Makefile.am: Redefine the check-DEJAGNU 
target
                to execute the testcase directly if DejaGnu isn't installed.
                * testsuite/server/Makefile.am:  Redefine the check-DEJAGNU 
target
                to execute the testcase directly if DejaGnu isn't installed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1178&r2=1.1179
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/Makefile.am?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/server.exp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1178
retrieving revision 1.1179
diff -u -b -r1.1178 -r1.1179
--- ChangeLog   12 Oct 2006 21:47:52 -0000      1.1178
+++ ChangeLog   12 Oct 2006 23:44:19 -0000      1.1179
@@ -1,3 +1,19 @@
+2006-10-12  Rob Savoye  <address@hidden>
+
+       * testsuite/libbase/Makefile.am: Redefine the check-DEJAGNU target
+       to execute the testcase directly if DejaGnu isn't installed.
+       * testsuite/libbase/libbase.exp: New test driver for libbase test
+       cases.
+       * testsuite/server/Makefile.am:  Redefine the check-DEJAGNU target
+       to execute the testcase directly if DejaGnu isn't installed.
+       * testsuite/server/server.exp: New test driver for server tests.
+
+2006-10-10  Rob Savoye  <address@hidden>
+
+       * gui/images/gnash_G_v3.ico: Updatedb "Gnashing 'G'" square
+       icon in color.
+       * gui/gtk.cpp: Use updated icon image used when minimized.
+
 2006-10-13 Sandro Santilli <address@hidden>
 
        * server/character.h: clarified semantic of get_width() and
@@ -24,21 +40,17 @@
 
 2006-10-12 Udo Giacomozzi <address@hidden>
   
-  * gnash/gui/fb.cpp, gnash/gui/fbsup.h, gnash/gui/gui.cpp,
-    gnash/gui/gui.h, gnash/server/button_character_instance.cpp,
-    gnash/server/button_character_instance.h, gnash/server/character.cpp,      
          
-    gnash/server/character.h, gnash/server/dlist.cpp, gnash/server/dlist.h,    
                  
-    gnash/server/edit_text_character.cpp, gnash/server/edit_text_character.h,  
      
-    gnash/server/generic_character.h, gnash/server/gnash.h,                    
  
-    gnash/server/movie_interface.h, gnash/server/movie_root.cpp,               
-    gnash/server/movie_root.h, gnash/server/sprite_instance.cpp,          
-    gnash/server/sprite_instance.h, gnash/server/types.cpp, 
-    gnash/server/parser/button_character_def.h, 
-    gnash/server/parser/character_def.h, 
-    gnash/server/parser/edit_text_character_def.h, 
-    gnash/server/parser/movie_def_impl.h,          
-    gnash/server/parser/sprite_definition.h,       
-    gnash/server/parser/text_character_def.h
+       * gui/fb.cpp, gui/fbsup.h, gui/gui.cpp, gui/gui.h,
+       server/button_character_instance.cpp, 
server/button_character_instance.h,
+       server/character.c, server/character.h, server/dlist.cpp,
+       server/dlist.h, server/edit_text_character.cpp,
+       server/edit_text_character.h, server/generic_character.h,
+       server/gnash.h, server/movie_interface.h, server/movie_root.cpp,        
      
+       server/movie_root.h, server/sprite_instance.cpp,
+       server/sprite_instance.h, gnash/server/types.cpp, 
+       server/parser/button_character_def.h, erver/parser/character_def.h, 
+       server/parser/edit_text_character_def.h, server/parser/movie_def_impl.h,
+       server/parser/sprite_definition.h, server/parser/text_character_def.h:
     Enhanced "rect" class and implemented a method to detect updated regions
     on the stage.
       
@@ -138,6 +150,7 @@
        * configure.ac, Makefile.am, macros/agg.m4: report need for
          AGG compatibility layer.
 
+>>>>>>> 1.1167
 2006-10-11 Sandro Santilli <address@hidden>
 
        * macros/gtkglext.m4: added missing -L to GLEXT_LIBS when
@@ -194,6 +207,7 @@
          moved matrix class in its own files and added/fixed
          documentation.
 
+>>>>>>> 1.1146
 2006-10-11 Markus Gothe <address@hidden>
 
        * macros/agg.m4: Added /usr/pkg/include.

Index: testsuite/libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- testsuite/libbase/Makefile.am       11 Oct 2006 21:50:56 -0000      1.15
+++ testsuite/libbase/Makefile.am       12 Oct 2006 23:44:19 -0000      1.16
@@ -39,9 +39,6 @@
 
 AUTOMAKE_OPTIONS = dejagnu
 
-# We don't need  --tool anymore
-RUNTESTDEFAULTFLAGS = --srcdir $$srcdir
-
 AM_LDFLAGS =  \
        $(top_builddir)/libbase/libgnashbase.la \
        $(NULL)
@@ -58,7 +55,7 @@
 
 abs_builddir=$(shell cd $(top_builddir)/testsuite/libbase; pwd)
 
-check_PROGRAMS = \
+noinst_PROGRAMS = \
        CurlStreamTest  \
        NoSeekFileTest \
        URLTest \
@@ -70,10 +67,10 @@
       gnash-dbg.log           \
       NoSeekFileTestCache
 
-TESTS = \
-       NoSeekFileTest          \
-       URLTest                 \
-       RcTest
+# TESTS = \
+#      NoSeekFileTest          \
+#      URLTest                 \
+#      RcTest
 
 
 CurlStreamTest_SOURCES = CurlStreamTest.cpp
@@ -91,3 +88,22 @@
 # LogTest_SOURCES = TCXXLog.cpp
 # LogTest_CPPFLAGS = '-DBUILDDIR="$(abs_builddir)"'
 
+TEST_DRIVERS = libbase.exp
+
+check-DEJAGNU: site-update $(noinst_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 "$(noinst_PROGRAMS)"; 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 \"$(noinst_PROGRAMS)\"" >> site.exp
\ No newline at end of file

Index: testsuite/server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/server/Makefile.am        11 Oct 2006 15:45:17 -0000      1.4
+++ testsuite/server/Makefile.am        12 Oct 2006 23:44:20 -0000      1.5
@@ -39,29 +39,41 @@
 
 AUTOMAKE_OPTIONS = dejagnu
 
-# We don't need  --tool anymore
-RUNTESTDEFAULTFLAGS = --srcdir $$srcdir
-
 INCLUDES = -I.. \
+       -I$(srcdir) \
         -I$(top_srcdir)/testsuite  \
         -I$(top_srcdir)/libbase  \
         -I$(top_srcdir)/server  \
        $(NULL)
 
-check_PROGRAMS = \
+noinst_PROGRAMS = \
        MatrixTest \
        $(NULL)
 
 CLEANFILES =                   \
        $(NULL)
 
-TESTS = \
-       MatrixTest              \
-       $(NULL)
-
-
 MatrixTest_SOURCES = MatrixTest.cpp
 MatrixTest_LDFLAGS = \
        $(top_builddir)/server/libgnashserver.la \
        $(NULL)
 
+TEST_DRIVERS = server.exp
+
+check-DEJAGNU: site-update $(noinst_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 "$(noinst_PROGRAMS)"; 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 \"$(noinst_PROGRAMS)\"" >> site.exp
\ No newline at end of file

Index: testsuite/server/server.exp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/server.exp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/server/server.exp 12 Oct 2006 19:36:24 -0000      1.1
+++ testsuite/server/server.exp 12 Oct 2006 23:44:20 -0000      1.2
@@ -14,7 +14,8 @@
 set timetol 0
 set params ""
 
-foreach file [glob *Test] {
+# testcases is set by the Makefile in the site.exp data file.
+foreach file $testcases {
     # spawn the executable and look for the DejaGnu output messages from the
     # test case.
     spawn -noecho -open [open "|./$file" "r"]