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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/16 19:31:48

Modified files:
        .              : ChangeLog 
        testsuite/actionscript.all: check.as ops.as 

Log message:
        don't run logical and/or tests if the installed Ming version is broken.
        Fix expected results with a sane Ming version.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5417&r2=1.5418
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/check.as?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ops.as?cvsroot=gnash&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5417
retrieving revision 1.5418
diff -u -b -r1.5417 -r1.5418
--- ChangeLog   16 Jan 2008 17:19:55 -0000      1.5417
+++ ChangeLog   16 Jan 2008 19:31:48 -0000      1.5418
@@ -1,3 +1,11 @@
+2008-01-16 Sandro Santilli <address@hidden>
+
+       * testsuite/actionscript.all/check.as: add a MING_LOGICAL_ANDOR_BROKEN
+         macro.
+       * testsuite/actionscript.all/ops.as: don't run logical and/or tests
+         if the installed Ming version is broken there... Fix expected
+         results with a sane Ming version.
+
 2008-01-16 Benjamin Wolsey <address@hidden>
 
        * server/parser/video_stream_def.cpp: fix size_t format warning.

Index: testsuite/actionscript.all/check.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/check.as,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- testsuite/actionscript.all/check.as 1 Oct 2007 06:33:54 -0000       1.32
+++ testsuite/actionscript.all/check.as 16 Jan 2008 19:31:48 -0000      1.33
@@ -29,6 +29,9 @@
 #  define MING_SUPPORTS_ASM_TOSTRING
 #  if MING_VERSION_CODE >= 00040005
 #   define MING_SUPPORTS_ASM_TARGETPATH
+#   if MING_VERSION_CODE < 00040006
+#     define MING_LOGICAL_ANDOR_BROKEN
+#   endif
 #  endif
 # endif
 #endif

Index: testsuite/actionscript.all/ops.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ops.as,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- testsuite/actionscript.all/ops.as   15 Jan 2008 09:35:11 -0000      1.33
+++ testsuite/actionscript.all/ops.as   16 Jan 2008 19:31:48 -0000      1.34
@@ -20,11 +20,10 @@
  *  Test binary predicates (equal, less_then, greater_then, logical and 
bitwise ops)
  */
 
-rcsid="$Id: ops.as,v 1.33 2008/01/15 09:35:11 strk Exp $";
+rcsid="$Id: ops.as,v 1.34 2008/01/16 19:31:48 strk Exp $";
 
 #include "check.as"
 
-
 //--------------------------------------------
 // Equality operator (ACTION_NEWEQUALS : 0x49)
 //--------------------------------------------
@@ -200,6 +199,9 @@
 //------------------------------------------------
 // Logical AND operator (ACTION_LOGICALAND : 0x10)
 //------------------------------------------------
+
+#ifndef MING_LOGICAL_ANDOR_BROKEN
+
 x = true;
 y = true;
 z = x && y;
@@ -223,7 +225,7 @@
 x = true;
 y = String("1.999");
 z=x && y;
-check_equals(z, x); 
+check_equals(z, "1.999"); 
 
 x=String("1.999");
 y=true;
@@ -234,7 +236,7 @@
 y=true;
 z=x && y;
 #if OUTPUT_VERSION < 7
-       check_equals(z, false);
+       check_equals(z, "adcd");
 #else
        check_equals(z, true);
 #endif 
@@ -242,11 +244,7 @@
 x=true;
 y=String("adcd");
 z=x && y;
-#if OUTPUT_VERSION < 7
-       check_equals(z, false);
-#else
-       check_equals(z, true);
-#endif
+check_equals(z, "adcd");
 
 x=0;
 y=true;
@@ -270,12 +268,20 @@
 x=String("adcd");
 y=false;
 z=x && y;
-check_equals(z, y); 
+#if OUTPUT_VERSION < 7
+       check_equals(z, "adcd"); 
+#else
+       check_equals(z, false);
+#endif
+
+#endif // ndef MING_LOGICAL_ANDOR_BROKEN
 
 //------------------------------------------------
 // Logical OR operator (ACTION_LOGICALOR : 0x11)
 //------------------------------------------------
 
+#ifndef MING_LOGICAL_ANDOR_BROKEN
+
 x = 0;
 y = 0;
 z = x || y;
@@ -289,8 +295,7 @@
 x = 0;
 y = 0.0001;
 z = x || y;
-check(z!=y); 
-check_equals(z, true); 
+check_equals(z, y); 
 
 x = 0;
 y = "abcd";
@@ -307,49 +312,42 @@
 y = String("abcd");
 z = x || y;
 #if OUTPUT_VERSION < 7
-       check_equals(z, false); 
+       check_equals(z, "abcd"); 
 #else
-       check_equals(z, true);
+       check_equals(z, "abcd");
 #endif
 
 x = 0;
 y = new String("abcd");
 z = x || y;
-check_equals(z, true);
+check_equals(z, "abcd");
 
 x = 0;
 y = Object();
 z = x || y;
-check_equals(z, true);
+check_equals(z, y);
 
 x = 0;
 y = new Object();
 z = x || y;
-check_equals(z, true);
+check_equals(z, y);
 
 x = 0;
 y = "0";
 z = x || y;
-#if OUTPUT_VERSION < 7
-       check_equals(z, false);
-#else
-       check_equals(z, true);
-#endif
+check_equals(typeof(z), 'string');
 
 x = 0;
 y = String("0");
 z = x || y;
-#if OUTPUT_VERSION < 7
-       check_equals(z, false);
-#else
-       check_equals(z, true);
-#endif
+check_equals(typeof(z), 'string');
 
 x = 0;
 y = new String("0");
 z = x || y;
-check(z!=y);
-check_equals(z, true);
+check_equals(z, y);
+
+#endif // ndef MING_LOGICAL_ANDOR_BROKEN
 
 //------------------------------------------------
 // String comparison (ACTION_STRINGCOMPARE : 0x29)
@@ -770,7 +768,15 @@
 check(isNaN(y));
 
 #if OUTPUT_VERSION < 7
- totals(228);
+# ifndef MING_LOGICAL_ANDOR_BROKEN
+ totals(226);
+# else
+ totals(203);
+# endif
 #else
- totals(230);
+# ifndef MING_LOGICAL_ANDOR_BROKEN
+ totals(228);
+# else
+ totals(205);
+# endif
 #endif