[Gnash-commit] /srv/bzr/gnash/trunk r9739: - Fix haxe-based testsuite build scripts.

[Sandro Santilli]

------------------------------------------------------------
revno: 9739
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Mon 2008-09-15 10:31:28 +0200
message:
  - Fix haxe-based testsuite build scripts.
  - Don't pretend as_value by Element is able to construct sprites (isn't)
modified:
  testsuite/libcore.all/AsValueTest.cpp
  testsuite/misc-haxe.all/Makefile.am
    ------------------------------------------------------------
    revno: 9737.1.1
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Mon 2008-09-15 08:24:02 +0200
    message:
      put the -main switch back or the resulting test won't be working
    modified:
      testsuite/misc-haxe.all/Makefile.am
    ------------------------------------------------------------
    revno: 9737.1.2
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Mon 2008-09-15 08:39:48 +0200
    message:
      MOVIECLIP-typed Element isn't converted to MOVIECLIP-typed as_value
      as per SharedObjectTest.
    modified:
      testsuite/libcore.all/AsValueTest.cpp
    ------------------------------------------------------------
    revno: 9737.1.3
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Mon 2008-09-15 10:29:33 +0200
    message:
      Don't build Dejagnu.swf, isn't needed (and build rule was not appropriate
      for it anyway)
    modified:
      testsuite/misc-haxe.all/Makefile.am

=== modified file 'testsuite/libcore.all/AsValueTest.cpp'
--- a/testsuite/libcore.all/AsValueTest.cpp     2008-09-06 15:38:25 +0000
+++ b/testsuite/libcore.all/AsValueTest.cpp     2008-09-15 06:39:48 +0000
@@ -159,14 +159,17 @@
         runtest.fail("as_value(Element &undefined)");
     }
     
-    Element el5;
-    el5.makeMovieClip();
-    as_value as5(el5);
-    if (as5.is_sprite()) {
-        runtest.pass("as_value(Element &movieclip)");
-    } else {
-        runtest.fail("as_value(Element &movieclip)");
-    }
+    // As for misc-ming.all/SharedObjectTest, MOVIECLIP values are serialized
+    // as undefined values.
+    //
+    //Element el5;
+    //el5.makeMovieClip();
+    //as_value as5(el5);
+    //if (as5.is_sprite()) {
+    //   runtest.pass("as_value(Element &movieclip)");
+    //} else {
+    //    runtest.fail("as_value(Element &movieclip)");
+    //}
 
     // There is no equivalent AMF element type to the as_value AS_FUNCTION type
 }

=== modified file 'testsuite/misc-haxe.all/Makefile.am'
--- a/testsuite/misc-haxe.all/Makefile.am       2008-09-12 19:47:19 +0000
+++ b/testsuite/misc-haxe.all/Makefile.am       2008-09-15 08:29:33 +0000
@@ -28,13 +28,7 @@
 
 ASTESTS = $(SANE_ASTESTS) $(BOGUS_ASTESTS)
 
-
-# These will get compiled to SWFs just as above, but will not be executed as a 
test
-# They are for secondary movies to be loaded by the above tests.
-AUXMOVIES = Dejagnu.hx  \
-       $(NULL)
-
-EXTRA_DIST = $(ASTESTS) $(AUXMOVIES) check.as
+EXTRA_DIST = $(ASTESTS) Dejagnu.hx check.as
 
 HAXE_FLAGS = -swf-version 9 -cp $(HAXE_CLASSPATH) -cp $(srcdir) 
 # hopefully preprocessor is builtin in this case
@@ -44,9 +38,7 @@
 BOGUS_ASTESTS_OUT = $(BOGUS_ASTESTS:.hx=.swf)
 ASTESTS_OUT = $(SANE_ASTESTS_OUT) $(BOGUS_ASTESTS_OUT)
 
-AUXMOVIES_OUT = $(AUXMOVIES:.hx=.swf)
-
-$(ASTESTS_OUT) $(AUXMOVIES_OUT): Dejagnu.hx check.as
+$(ASTESTS_OUT) : Dejagnu.hx check.as
 
 
 TEST_DRIVERS = ../simple.exp
@@ -55,17 +47,17 @@
        bogustests-runner \
        $(NULL)
 
-sanetests-runner: $(srcdir)/../generic-testrunner.sh $(SANE_ASTESTS_OUT) 
$(AUXMOVIES_OUT) Makefile
+sanetests-runner: $(srcdir)/../generic-testrunner.sh $(SANE_ASTESTS_OUT) 
Makefile
        sh $< -c __END_OF_TEST__ -r 50 $(top_builddir) $(SANE_ASTESTS_OUT) > $@
        chmod 755 $@
 
-bogustests-runner: $(srcdir)/../generic-testrunner.sh $(BOGUS_ASTESTS_OUT) 
$(AUXMOVIES_OUT) Makefile
+bogustests-runner: $(srcdir)/../generic-testrunner.sh $(BOGUS_ASTESTS_OUT) 
Makefile
        sh $< -C __END_OF_TEST__ -r 50 $(top_builddir) $(BOGUS_ASTESTS_OUT) > $@
        chmod 755 $@
 
 .hx.swf: 
        $(HAXE_CPP) $< > $(@:%.swf=PP_%.hx) 
-       $(HAXE) $(HAXE_FLAGS) -swf $@ $(@:%.swf=PP_%.hx)
+       $(HAXE) $(HAXE_FLAGS) -swf $@ -main $(@:%.swf=PP_%.hx)
 
 CLEANFILES =  \
        gnash-dbg.log \