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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/31 11:26:18

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: Makefile.am place_object_test.c 
Removed files:
        testsuite/misc-ming.all: place_object_testrunner.cpp 

Log message:
                * testsuite/misc-ming.all/: Makefile.am, place_object_test.c,
                  place_object_testrunner.cpp: Test turned into a self-contained
                  one.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2022&r2=1.2023
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/place_object_test.c?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/place_object_testrunner.cpp?cvsroot=gnash&r1=1.2&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2022
retrieving revision 1.2023
diff -u -b -r1.2022 -r1.2023
--- ChangeLog   31 Dec 2006 11:12:18 -0000      1.2022
+++ ChangeLog   31 Dec 2006 11:26:18 -0000      1.2023
@@ -2,6 +2,9 @@
 
        * testsuite/misc-ming.all/ming_utils.h:
          Include filename in test result messages.
+       * testsuite/misc-ming.all/: Makefile.am, place_object_test.c,
+         place_object_testrunner.cpp: Test turned into a self-contained
+         one.
 
 2006-12-30 Sandro Santilli <address@hidden>
 

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- testsuite/misc-ming.all/Makefile.am 30 Dec 2006 23:48:59 -0000      1.49
+++ testsuite/misc-ming.all/Makefile.am 31 Dec 2006 11:26:18 -0000      1.50
@@ -64,13 +64,13 @@
        loop_test \
        loop_test-Runner \
        place_object_test \
-       place_object_testrunner \
        place_and_remove_object_test \
        $(NULL)
 
 check_SCRIPTS = \
        VarAndCharClashTest-Runner \
        timeline_var_test-Runner \
+       place_object_testrunner \
        place_and_remove_object_testrunner \
        $(NULL)
 
@@ -207,16 +207,9 @@
 place_object_test.swf: place_object_test
        ./place_object_test $(top_srcdir)/testsuite/media
 
-place_object_testrunner_SOURCES = \
-       place_object_testrunner.cpp \
-       $(NULL)
-place_object_testrunner_LDADD = \
-       $(top_builddir)/testsuite/libtestsuite.la \
-       $(NULL)
-place_object_testrunner_DEPENDENCIES = \
-       $(top_builddir)/testsuite/libtestsuite.la \
-       place_object_test.swf      \
-       $(NULL)
+place_object_testrunner: $(srcdir)/../generic-testrunner.sh 
place_object_test.swf
+       sh $< -r5 $(top_builddir) place_object_test.swf > $@
+       chmod 755 $@
 
 place_and_remove_object_test_SOURCES = \
        place_and_remove_object_test.c  \

Index: testsuite/misc-ming.all/place_object_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/place_object_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/place_object_test.c 31 Dec 2006 00:29:39 -0000      
1.2
+++ testsuite/misc-ming.all/place_object_test.c 31 Dec 2006 11:26:18 -0000      
1.3
@@ -62,13 +62,13 @@
        Ming_init();
        mo = newSWFMovie();
        SWFMovie_setDimension(mo, 800, 600);
-       SWFMovie_setRate (mo, 1.0);
+       //SWFMovie_setRate (mo, 1.0);
 
-       //dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 
10, 0, 0, 800, 600);
-       //SWFMovie_add(mo, (SWFBlock)dejagnuclip);
-       //SWFMovie_nextFrame(mo); 
+       dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 
0, 0, 800, 600);
+       SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+       SWFMovie_nextFrame(mo); 
 
-       sh1 = make_fill_square (0, 300, 60, 60, 255, 0, 0, 255, 0, 0);
+       sh1 = make_fill_square (250, 300, 60, 60, 255, 0, 0, 255, 0, 0);
        sh2 = make_fill_square (300, 300, 60, 60, 255, 0, 0, 0, 0, 0);
        
        it = SWFMovie_add(mo, (SWFBlock)sh1);  
@@ -79,6 +79,12 @@
        SWFDisplayItem_setName(it, "sh2"); 
        SWFDisplayItem_setDepth(it, 3); //place the sh2 character at depth 3 
again!
 
+       check(mo, "sh1 != undefined");
+       xcheck(mo, "sh2 != undefined");
+
+       // we need to allow 2 runs as the first one won't play (correct?)
+       add_actions(mo, "_root.totals(); stop();");
+
        SWFMovie_nextFrame(mo); 
 
 

Index: testsuite/misc-ming.all/place_object_testrunner.cpp
===================================================================
RCS file: testsuite/misc-ming.all/place_object_testrunner.cpp
diff -N testsuite/misc-ming.all/place_object_testrunner.cpp
--- testsuite/misc-ming.all/place_object_testrunner.cpp 28 Dec 2006 01:44:09 
-0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-/* 
- *   Copyright (C) 2005, 2006 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 2 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
- *
- *
- */ 
-
-#define INPUT_FILENAME "place_object_test.swf"
-
-#include "MovieTester.h"
-#include "sprite_instance.h"
-#include "character.h"
-#include "dlist.h"
-#include "container.h"
-#include "log.h"
-#include "GnashException.h"
-
-#include "check.h"
-
-#include <string>
-#include <iostream>
-#include <cassert>
-#include <memory>
-
-using namespace gnash;
-using namespace std;
-
-int
-main(int /*argc*/, char** /*argv*/)
-{
-       string filename = INPUT_FILENAME;
-       auto_ptr<MovieTester> t;
-
-       try
-       {
-               t.reset(new MovieTester(filename));
-       }
-       catch (const GnashException& e)
-       {
-               std::cerr << "Error initializing MovieTester: " << e.what() << 
std::endl;
-               exit(EXIT_FAILURE);
-       }
-
-       MovieTester& tester = *t;
-
-       // TODO: check why we need this !!
-       //       I wouldn't want the first advance to be needed
-       tester.advance();
-
-       gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
-       dbglogfile.setVerbosity(1);
-       dbglogfile.setActionDump(1);
-
-       sprite_instance* root = tester.getRootMovie();
-       assert(root);
-
-       check_equals(root->get_frame_count(), 1);
-
-       const character* ch = tester.findDisplayItemByDepth(*root, 3);
-       check(ch);
-       check_equals(ch->get_name(), "sh1"); 
-}
-