[Gnash-commit] gnash ./ChangeLog testsuite/misc-ming.all/Makef...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/09 21:23:53

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: Makefile.am moviecliploader_test.c 

Log message:
        moviecliploader_test updated to test both relative and absolute urls
        as well as .swf and .jpeg types

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.289&tr2=1.290&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/testsuite/misc-ming.all/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/testsuite/misc-ming.all/moviecliploader_test.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.289 gnash/ChangeLog:1.290
--- gnash/ChangeLog:1.289       Tue May  9 21:09:39 2006
+++ gnash/ChangeLog     Tue May  9 21:23:53 2006
@@ -3,6 +3,8 @@
        * testsuite/misc-ming.all/moviecliploader_test.c,
        testsuite/misc-ming.all/Makefile.am:
        moviecliploader_test fixed to build using the new media dir
+       and to test both relative and absolute url, both jpeg 
+       and swf medias.
        * testsuite/media/green.swf, testsuite/media/lynch.swf,
        testsuite/media/offspring.swf: added definejpeg2 swf
        versions of the corresponding jpeg files.
Index: gnash/testsuite/misc-ming.all/Makefile.am
diff -u gnash/testsuite/misc-ming.all/Makefile.am:1.4 
gnash/testsuite/misc-ming.all/Makefile.am:1.5
--- gnash/testsuite/misc-ming.all/Makefile.am:1.4       Tue May  9 21:09:39 2006
+++ gnash/testsuite/misc-ming.all/Makefile.am   Tue May  9 21:23:53 2006
@@ -66,7 +66,12 @@
 spritehier_SOURCES =  spritehier.c
 spritehier_LDADD = $(MING_LIBS)
 
-moviecliploader_test.swf: moviecliploader_test
+moviecliploader_tests: moviecliploader_test
+       : test with relative urls 
+       ln -fs $(top_srcdir)/testsuite/media media
+       ./moviecliploader_test media
+       mv moviecliploader_test.swf moviecliploader_test_relative.swf
+       : test absolute url
        ./moviecliploader_test $(top_srcdir)/testsuite/media
 
 definebitsjpeg2.swf: definebitsjpeg2
@@ -75,6 +80,7 @@
 spritehier.swf: spritehier
        ./spritehier
 
+clean: 
+       rm *.swf media
 endif
 
-
Index: gnash/testsuite/misc-ming.all/moviecliploader_test.c
diff -u gnash/testsuite/misc-ming.all/moviecliploader_test.c:1.2 
gnash/testsuite/misc-ming.all/moviecliploader_test.c:1.3
--- gnash/testsuite/misc-ming.all/moviecliploader_test.c:1.2    Tue May  9 
21:09:39 2006
+++ gnash/testsuite/misc-ming.all/moviecliploader_test.c        Tue May  9 
21:23:53 2006
@@ -87,14 +87,14 @@
        sprintf(file_green, "%s/green.jpg", srcdir);
        sprintf(file_offspring, "%s/offspring.jpg", srcdir);
 
-       /* Test these three kind of url definitions */
+       /*
+        * Test urls with and w/out 'file://' prefix.
+        * Test both jpeg and swf loading.
+        */
        sprintf(url_lynch, "file://%s/lynch.swf", srcdir);
-       sprintf(url_green, "file:///%s/green.swf", srcdir);
+       sprintf(url_green, "file://%s/green.jpg", srcdir);
        sprintf(url_offspring, "%s/offspring.swf", srcdir);
 
-       /*
-        *  TODO: add relative url tests and load of jpegs
-        */
 
        puts("Setting things up");