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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/20 07:21:26

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: Makefile.am ButtonEventsTest-Runner.cpp 

Log message:
                * testsuite/misc-ming.all/: Makefile.am, 
ButtonEventsTest-Runner.cpp:
                  Allow execution of the test runner from a foreign dir.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2942&r2=1.2943
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2942
retrieving revision 1.2943
diff -u -b -r1.2942 -r1.2943
--- ChangeLog   20 Apr 2007 06:58:24 -0000      1.2942
+++ ChangeLog   20 Apr 2007 07:21:26 -0000      1.2943
@@ -1,3 +1,8 @@
+2007-04-20 Sandro Santilli <address@hidden>
+
+       * testsuite/misc-ming.all/: Makefile.am, ButtonEventsTest-Runner.cpp:
+         Allow execution of the test runner from a foreign dir.
+
 2007-04-20 Zou Lunkai <address@hidden>
 
        * testsuite/actionscript.all/MovieLip.as

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- testsuite/misc-ming.all/Makefile.am 18 Apr 2007 08:13:45 -0000      1.95
+++ testsuite/misc-ming.all/Makefile.am 20 Apr 2007 07:21:26 -0000      1.96
@@ -77,6 +77,7 @@
        place_and_remove_object_test \
        place_and_remove_object_insane_test \
        displaylist_depths_test \
+       masks_test \
        attachMovieTest \
        attachMovieTestRunner \
        attachMovieLoopingTest \
@@ -147,6 +148,7 @@
        path_format_testrunner \
        duplicate_movie_clip_testrunner \
        matrix_testrunner \
+       masks_testrunner \
        $(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -379,6 +381,20 @@
        sh $< -r5 $(top_builddir) displaylist_depths_test.swf > $@
        chmod 755 $@
 
+masks_test_SOURCES =   \
+       masks_test.c    \
+       ming_utils.h            \
+       ming_utils.c            \
+       $(NULL)
+masks_test_LDADD = $(MING_LIBS)
+
+masks_test.swf: masks_test
+       ./masks_test $(top_srcdir)/testsuite/media
+
+masks_testrunner: $(srcdir)/../generic-testrunner.sh masks_test.swf
+       sh $< -r5 $(top_builddir) masks_test.swf > $@
+       chmod 755 $@
+
 matrix_test_SOURCES =  \
        matrix_test.c   \
        ming_utils.h            \
@@ -781,6 +797,9 @@
        $(top_builddir)/testsuite/libtestsuite.la \
        ButtonEventsTest.swf    \
        $(NULL)
+ButtonEventsTest_Runner_CXXFLAGS = \
+       -DTGTDIR='"$(abs_builddir)"' \
+       $(NULL)
 
 loadMovieTest_SOURCES =        \
        loadMovieTest.c \
@@ -960,6 +979,7 @@
        frame_label_testrunner \
        path_format_testrunner \
        duplicate_movie_clip_testrunner \
+       masks_testrunner \
        $(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS

Index: testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp 6 Apr 2007 11:43:44 
-0000       1.11
+++ testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp 20 Apr 2007 07:21:26 
-0000      1.12
@@ -43,6 +43,7 @@
        check_equals(string(text2->get_text_value()), string("RollOver"));
        check(tester.isMouseOverMouseEntity());
        // TODO: check that pixel @ 60,60 is yellow !
+       //tester.checkPixel(2, rgba(0,0,0,255), 1);
 
        // press the mouse button, this should change
        // the textfield value.
@@ -106,7 +107,8 @@
 int
 main(int /*argc*/, char** /*argv*/)
 {
-       string filename = INPUT_FILENAME;
+       //string filename = INPUT_FILENAME;
+       string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
        MovieTester tester(filename);
 
        std::string idleString = "Idle";