[Gnash-commit] /srv/bzr/gnash/trunk r11207: Do a swfmill version check to avoid bogus failures in the testsuite.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 11207
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Tue 2009-07-07 10:02:22 +0200
message:
  Do a swfmill version check to avoid bogus failures in the testsuite.
modified:
  Makefile.am
  configure.ac
  macros/swfmill.m4
  testsuite/misc-swfmill.all/Makefile.am
    ------------------------------------------------------------
    revno: 11205.1.1
    committer: Benjamin Wolsey <address@hidden>
    branch nick: temp
    timestamp: Tue 2009-07-07 09:52:53 +0200
    message:
      Check swfmill version, log it, warn if it's too low when building AVM2,
      and don't run AS3 tests when swfmill doesn't support it.
    modified:
      Makefile.am
      configure.ac
      macros/swfmill.m4
      testsuite/misc-swfmill.all/Makefile.am

=== modified file 'Makefile.am'
--- a/Makefile.am       2009-06-13 17:10:58 +0000
+++ b/Makefile.am       2009-07-07 07:52:53 +0000
@@ -307,6 +307,7 @@
 endif
 if ENABLE_SWFMILL
        @echo " SWFMILL $(SWFMILL) "
+       @echo " SWFMILL_VERSION_CODE $(SWFMILL_VERSION) "
 endif
 if ENABLE_SWFC
        @echo " SWFC $(SWFC) "

=== modified file 'configure.ac'
--- a/configure.ac      2009-06-19 18:46:22 +0000
+++ b/configure.ac      2009-07-07 07:52:53 +0000
@@ -1756,8 +1756,12 @@
   AC_PATH_MTASC
   AC_PATH_HAXE
 fi
+
+AM_CONDITIONAL(ENABLE_SWFMILL, [ test x"$SWFMILL" != x ])
+AM_CONDITIONAL(SWFMILL_AS3_SUPPORT,
+        [ test x"$SWFMILL" != x && test $SWFMILL_VERSION -ge 00021206 ])
+
 AM_CONDITIONAL(ENABLE_AS3COMPILE, [ test x"$AS3COMPILE" != x ])
-AM_CONDITIONAL(ENABLE_SWFMILL, [ test x"$SWFMILL" != x ])
 AM_CONDITIONAL(ENABLE_MTASC, [ test x"$MTASC" != x ])
 AM_CONDITIONAL(ENABLE_HAXE, [ test x"$HAXE" != x ])
 AM_CONDITIONAL(ENABLE_SWFC, [ test x"$SWFC" != x ])
@@ -3136,7 +3140,7 @@
       echo "        HAXE CLASSPATH is $HAXE_CLASSPATH"
     else
       echo "        WARNING: You need to have the HAXE compiler package " >&4
-      echo "                 version 2.00 or hither installed" >&4
+      echo "                 version 2.00 or higher installed" >&4
       echo "                 to run some of the tests in Gnash testsuite." >&4
       echo "                 You can install it from http://haxe.org"; >&4
       echo "                 or .deb users: apt-get install haxe" >&4
@@ -3144,6 +3148,11 @@
 
     if test x"$SWFMILL" != x; then
       echo "        SWFMILL is $SWFMILL"
+      if test x"$ENABLE_AVM2" != x -a "$SWFMILL_VERSION" -lt 00021206; then
+        echo "        WARNING: You are building Gnash with AVM2 support but" 
>&4
+        echo "                 your swfmill version is too old to run AS3" >&4
+        echo "                 tests." >&4
+      fi
     else
       echo "        WARNING: You need to have the 'swfmill' tool installed" >&4
       echo "                 to run some of the tests in Gnash testsuite." >&4

=== modified file 'macros/swfmill.m4'
--- a/macros/swfmill.m4 2009-01-22 20:10:39 +0000
+++ b/macros/swfmill.m4 2009-07-07 07:52:53 +0000
@@ -38,6 +38,20 @@
     AC_PATH_PROG(SWFMILL, swfmill, ,[${pathlist}])
   fi
 
+  if test x"$SWFMILL" != "x"; then
+    sm=`$SWFMILL -h 2>&1 | head -n 4`
+    version=`echo $sm | grep 'swfmill 
[[0-9]]\{1,2\}\(\.[[0-9]]\{1,2\}\)\{2,3\}' | cut -d' ' -f2`
+    major=`echo $version | cut -d'.' -f1`
+    minor=`echo $version | cut -d'.' -f2`
+    micro=`echo $version | cut -d'.' -f3`
+    beta=`echo $version | cut -d'.' -f4`
+    if test -z $beta; then
+      beta=0
+    fi
+    SWFMILL_VERSION=`printf %2.2d%2.2d%2.2d%2.2d $major $minor $micro $beta`
+  fi
+
+  AC_SUBST(SWFMILL_VERSION)
   AC_SUBST(SWFMILL)
 ])
 

=== modified file 'testsuite/misc-swfmill.all/Makefile.am'
--- a/testsuite/misc-swfmill.all/Makefile.am    2009-06-29 11:43:07 +0000
+++ b/testsuite/misc-swfmill.all/Makefile.am    2009-07-07 07:52:53 +0000
@@ -74,9 +74,11 @@
 TRACE_XMLTESTS_OUT = 
 
 if ENABLE_AVM2
+if SWFMILL_AS3_SUPPORT
 SC_XMLTESTS_OUT += $(SC_AS3_XMLTESTS:.xml=.swf)
 TRACE_XMLTESTS_OUT += $(TRACE_AS3_TESTS:.xml=.swf)
 endif
+endif
 
 # Dependencies for all self-contained SWF tests
 $(SC_XMLTESTS_OUT) : 
@@ -93,11 +95,13 @@
        $(NULL)
 
 if ENABLE_AVM2
+if SWFMILL_AS3_SUPPORT
 check_SCRIPTS += \
        mixed-bytecode-as3-runner       \
        trace-test-runner       \
        $(NULL)
 endif
+endif
 
 check_PROGRAMS = \
        backgroundTestRunner \