[Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Inhe...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/02 15:43:43

Modified files:
        .              : ChangeLog 
        testsuite/actionscript.all: Inheritance.as Makefile.am String.as 
                                    check.as 

Log message:
                * testsuite/actionscript.all/Makefile.am: provide
                  MING_VERSION_CODE define.
                * testsuite/actionscript.all/check.as: toggle define
                  MING_SUPPORTS_ASM and MING_SUPPORT_ASM_EXTEND based
                  on MING_VERSION_CODE
                * testsuite/actionscript.all/String.as: don't assume
                  that ming supports ASM, rely on the define set in
                  check.as instead.
                * testsuite/actionscript.all/Inheritance.as:
                  Add test for ActionExtend (optionally enabled
                  based on MING_SUPPORTS_ASM_EXTENDS define)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2031&r2=1.2032
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Inheritance.as?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Makefile.am?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/String.as?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/check.as?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2031
retrieving revision 1.2032
diff -u -b -r1.2031 -r1.2032
--- ChangeLog   2 Jan 2007 15:10:34 -0000       1.2031
+++ ChangeLog   2 Jan 2007 15:43:42 -0000       1.2032
@@ -1,5 +1,19 @@
 2007-01-02 Sandro Santilli <address@hidden>
 
+       * testsuite/actionscript.all/Makefile.am: provide
+         MING_VERSION_CODE define.
+       * testsuite/actionscript.all/check.as: toggle define
+         MING_SUPPORTS_ASM and MING_SUPPORT_ASM_EXTEND based
+         on MING_VERSION_CODE
+       * testsuite/actionscript.all/String.as: don't assume
+         that ming supports ASM, rely on the define set in
+         check.as instead.
+       * testsuite/actionscript.all/Inheritance.as:
+         Add test for ActionExtend (optionally enabled
+         based on MING_SUPPORTS_ASM_EXTENDS define)
+
+2007-01-02 Sandro Santilli <address@hidden>
+
        * macros/ming.m4: synced with the version in Ming repository.
          Basically add MING_VERSION and MING_VERSION_CODE variable,
          we'll use them to detect wheter 'asm' or specific features

Index: testsuite/actionscript.all/Inheritance.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Inheritance.as,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- testsuite/actionscript.all/Inheritance.as   2 Jan 2007 01:50:56 -0000       
1.13
+++ testsuite/actionscript.all/Inheritance.as   2 Jan 2007 15:43:42 -0000       
1.14
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Inheritance.as,v 1.13 2007/01/02 01:50:56 strk Exp $";
+rcsid="$Id: Inheritance.as,v 1.14 2007/01/02 15:43:42 strk Exp $";
 
 #include "check.as"
 
@@ -168,3 +168,26 @@
 
 check_equals(SubObj1.prototype.constructor.__proto__.constructor, Function);
 
+//------------------------------------------------
+// Test the 'extends' tag (require ming > 0.4.0.beta3)
+//------------------------------------------------
+
+// see check.as
+#ifdef MING_SUPPORTS_ASM_EXTENDS
+
+function BaseClass1() {}
+function DerivedClass1() {}
+asm {
+       push "DerivedClass1"
+       getvariable
+       push "BaseClass1"
+       getvariable
+       extends
+};
+var obj = new DerivedClass1;
+check(obj instanceOf DerivedClass1);
+check(obj instanceOf BaseClass1);
+check_equals(obj.__proto__, DerivedClass1.prototype);
+check_equals(DerivedClass1.prototype.constructor, BaseClass1);
+
+#endif // MING_SUPPORTS_ASM_EXTENDS

Index: testsuite/actionscript.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- testsuite/actionscript.all/Makefile.am      28 Dec 2006 02:39:18 -0000      
1.57
+++ testsuite/actionscript.all/Makefile.am      2 Jan 2007 15:43:42 -0000       
1.58
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.57 2006/12/28 02:39:18 strk Exp $
+# $Id: Makefile.am,v 1.58 2007/01/02 15:43:42 strk Exp $
 
 AUTOMAKE_OPTIONS = dejagnu
 
@@ -26,6 +26,8 @@
 # so I take responsibility of dropping that for the moment...
 if ENABLE_MING
 
+DEF_MAKESWF_FLAGS=-DMING_VERSION_CODE=$(MING_VERSION_CODE)
+
 check_SCRIPTS = \
        astests-v5-Runner \
        astests-v6-Runner \
@@ -216,10 +218,11 @@
 # takes to the Dejagnu.swf shared library we'll get visual traces,
 # otherwise normal traces will be used.
 .as.swf: 
-       @$(MAKESWF) \
+       $(MAKESWF) \
                -i$(DEJAGNU_SO_URL):dejagnu \
                -DUSE_DEJAGNU_MODULE \
                -DOUTPUT_VERSION=$(SWFVERSION) -v$(SWFVERSION) \
+               $(DEF_MAKESWF_FLAGS) \
                $(MAKESWF_FLAGS) \
                -o $@ \
                $(srcdir)/dejagnu_so_init.as \
@@ -235,6 +238,7 @@
                -i$(DEJAGNU_SO_URL):dejagnu \
                -DUSE_DEJAGNU_MODULE \
                -DOUTPUT_VERSION=$(SWFVERSION) -v$(SWFVERSION) \
+               $(DEF_MAKESWF_FLAGS) \
                $(MAKESWF_FLAGS) \
                -o $@ \
                $(srcdir)/dejagnu_so_init.as \

Index: testsuite/actionscript.all/String.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/String.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/actionscript.all/String.as        21 Dec 2006 11:34:49 -0000      
1.9
+++ testsuite/actionscript.all/String.as        2 Jan 2007 15:43:42 -0000       
1.10
@@ -1,7 +1,7 @@
 // Mike Carlson's test program for actionscript strings
 // June 19th, 2006
 
-rcsid="$Id: String.as,v 1.9 2006/12/21 11:34:49 strk Exp $";
+rcsid="$Id: String.as,v 1.10 2007/01/02 15:43:42 strk Exp $";
 
 #include "check.as"
 
@@ -55,8 +55,9 @@
 check_equals ( b.substring(3, 6), "4");
 check_equals ( b.substr(3, 6), "4");
 
-#define MING_SUPPORTS_ASM
+// see check.as
 #ifdef MING_SUPPORTS_ASM
+
 // We need ming-0.4.0beta2 or later for this to work...
 // This is the only way to generate an SWFACTION_SUBSTRING
 // tag (the calls above generate a CALLMETHOD tag)

Index: testsuite/actionscript.all/check.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/check.as,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/actionscript.all/check.as 23 Nov 2006 14:34:32 -0000      1.17
+++ testsuite/actionscript.all/check.as 2 Jan 2007 15:43:42 -0000       1.18
@@ -21,6 +21,14 @@
 #ifndef _CHECK_AS_
 #define _CHECK_AS_
 
+#if MING_VERSION_CODE >= 00040002
+# define MING_SUPPORTS_ASM
+# if MING_VERSION_CODE >= 00040004
+#  define MING_SUPPORTS_ASM_EXTENDS
+# endif
+#endif
+
+
 // ONLINE mode uses DEJAGNU module
 #ifdef ONLINE
 # define USE_DEJAGNU_MODULE