[Gnash-commit] /srv/bzr/gnash/trunk r10474: Add --enable-red5-testing

[Sandro Santilli]

------------------------------------------------------------
revno: 10474
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Sat 2008-12-20 03:03:30 +0100
message:
  Add --enable-red5-testing
modified:
  Makefile.am
  configure.ac
  testsuite/misc-ming.all/Makefile.am
  testsuite/misc-ming.all/red5test.as

=== modified file 'Makefile.am'
--- a/Makefile.am       2008-12-16 19:44:02 +0000
+++ b/Makefile.am       2008-12-20 02:03:30 +0000
@@ -264,6 +264,9 @@
 if ENABLE_HTTP_TESTSUITE
        @echo " HTTP_TESTSUITE $(HTTP_TESTSUITE)"
 endif
+if ENABLE_RED5_TESTING
+       @echo " RED5_HOST $(RED5_HOST)"
+endif
        @echo "Graphics support..."     
 if BUILD_CAIRO_RENDERER
        @echo " CAIRO_CFLAGS is $(CAIRO_CFLAGS)"

=== modified file 'configure.ac'
--- a/configure.ac      2008-12-18 00:59:49 +0000
+++ b/configure.ac      2008-12-20 02:03:30 +0000
@@ -1560,6 +1560,20 @@
 fi
 AM_CONDITIONAL(ENABLE_HTTP_TESTSUITE, [ test x"$HTTP_TESTSUITE" != x ])
 
+if test x$cross_compiling = xno; then
+  AC_ARG_ENABLE([red5_testing],
+      dnl # TODO: find out how to add [quotes] around '=<baseurl>'
+         AC_HELP_STRING([--enable-red5-testing=<host>],
+                 [Enable red5 based testing (default host is localhost)]),
+             [case "${enableval}" in
+             no) RED5_HOST="" ;;
+            yes) RED5_HOST="localhost" ;;
+              *) RED5_HOST="${enableval}";;
+           esac])
+  AC_SUBST(RED5_HOST)
+fi
+AM_CONDITIONAL(ENABLE_RED5_TESTING, [ test x"$RED5_HOST" != x ])
+
 dnl
 dnl See if we can use the swfmill, mtasc, swfc and haxe based testsuites 
 dnl
@@ -2901,6 +2915,9 @@
     echo "        HTTP testsuite dir is $HTTP_TESTSUITE"
   fi
 
+  if test x"$RED5_HOST" != x; then
+    echo "        RED5 testing host is $RED5_HOST"
+  fi
 
   if test x"$PYTHON" != x; then
     echo "        PYTHON is $PYTHON"

=== modified file 'testsuite/misc-ming.all/Makefile.am'
--- a/testsuite/misc-ming.all/Makefile.am       2008-12-18 16:57:32 +0000
+++ b/testsuite/misc-ming.all/Makefile.am       2008-12-20 02:03:30 +0000
@@ -312,6 +312,9 @@
 if ENABLE_HTTP_TESTSUITE
 check_SCRIPTS += remotingTestRunner
 endif
+if ENABLE_RED5_TESTING
+check_SCRIPTS += red5testRunner
+endif
 endif
 
 if MING_VERSION_0_4
@@ -1735,6 +1738,10 @@
 
 red5test.swf: $(srcdir)/red5test.as Dejagnu.swf Makefile 
../actionscript.all/check.as ../actionscript.all/utils.as
        $(MAKESWF) -n network -r12 -o $@ -v7 -DRED5_HOST='\"$(RED5_HOST)\"' 
-DUSE_DEJAGNU_MODULE -DOUTPUT_VERSION=7 Dejagnu.swf $(srcdir)/red5test.as 
$(srcdir)/../actionscript.all/dejagnu_so_fini.as
+
+red5testRunner: $(srcdir)/../generic-testrunner.sh red5test.swf
+       sh $< $(top_builddir) red5test.swf > $@
+       chmod 755 $@
        
 
 DragDropTest.swf: $(srcdir)/DragDropTest.as Dejagnu.swf DragDropTestLoaded.swf 
Makefile ../actionscript.all/check.as ../actionscript.all/utils.as
@@ -1999,6 +2006,9 @@
 if ENABLE_HTTP_TESTSUITE
 TEST_CASES += remotingTestRunner
 endif
+if ENABLE_RED5_TESTING
+TEST_CASES += red5testRunner
+endif
 endif
 
 if MING_SUPPORTS_INIT_ACTIONS

=== modified file 'testsuite/misc-ming.all/red5test.as'
--- a/testsuite/misc-ming.all/red5test.as       2008-12-18 17:19:13 +0000
+++ b/testsuite/misc-ming.all/red5test.as       2008-12-20 02:03:30 +0000
@@ -63,7 +63,9 @@
 //nc.connect("rtmp://localhost/");
 
 // nc.onStatus: level:status, code:NetConnection.Connect.Success
-nc.connect("rtmp://localhost/echo");
+rtmpuri = "rtmp://"+host+"/echo";
+note("Connecting to "+rtmpuri);
+nc.connect(rtmpuri);
 check_equals(nc.isConnected, false); // not yet
 check_equals(nc.statuses.length, 0);