[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-470-g1ae9584

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  1ae9584391b1ac1160448f4654e918f7107cff9d (commit)
      from  f9ff23aea5962b412176d4a129c4db512986ef23 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=1ae9584391b1ac1160448f4654e918f7107cff9d


commit 1ae9584391b1ac1160448f4654e918f7107cff9d
Author: Sandro Santilli <address@hidden>
Date:   Tue Jul 12 15:39:11 2011 +0200

    Add test for constant pool usage on CallFrame action (succeeds)

diff --git a/testsuite/misc-swfmill.all/Makefile.am 
b/testsuite/misc-swfmill.all/Makefile.am
index fba0506..8e97db4 100644
--- a/testsuite/misc-swfmill.all/Makefile.am
+++ b/testsuite/misc-swfmill.all/Makefile.am
@@ -48,6 +48,7 @@ SC_AS2_XMLTESTS = \
        func_dict.xml \
        afunc_dict.xml \
        dict_cross.xml \
+       dict_callframe.xml \
        initaction_in_definesprite.xml \
        zeroframe_definesprite.xml \
        background.xml \
@@ -97,6 +98,7 @@ check_SCRIPTS = \
        dict_override-runner \
        func_dict-runner \
        dict_cross-runner \
+       dict_callframe-runner \
        afunc_dict-runner \
        initaction_in_definesprite-runner \
        zeroframe_definesprite-runner \
@@ -134,6 +136,10 @@ dict_cross-runner: $(srcdir)/../generic-testrunner.sh 
dict_cross.swf Makefile
        sh $(srcdir)/../generic-testrunner.sh -r 1 -c "END OF TEST" 
$(top_builddir) dict_cross.swf > $@
        chmod 755 $@
 
+dict_callframe-runner: $(srcdir)/../generic-testrunner.sh dict_callframe.swf 
Makefile
+       sh $(srcdir)/../generic-testrunner.sh -r 1 -c "END OF TEST" 
$(top_builddir) dict_callframe.swf > $@
+       chmod 755 $@
+
 func_dict-runner: $(srcdir)/../generic-testrunner.sh func_dict.swf Makefile
        sh $(srcdir)/../generic-testrunner.sh -r 1 -c "END OF TEST" 
$(top_builddir) func_dict.swf > $@
        chmod 755 $@
diff --git a/testsuite/misc-swfmill.all/dict_callframe.xml 
b/testsuite/misc-swfmill.all/dict_callframe.xml
new file mode 100644
index 0000000..5622e8c
--- /dev/null
+++ b/testsuite/misc-swfmill.all/dict_callframe.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<swf version="6" compressed="0">
+
+<!--
+
+ Test file for https://savannah.gnu.org/bugs/?33521
+
+ Shows that the constant pool is restored after return
+ from a call frame
+
+-->
+
+  <Header framerate="1" frames="2">
+    <size>
+      <Rectangle left="0" right="12800" top="0" bottom="9600"/>
+    </size>
+    <tags>
+
+      <!-- FRAME 1 : push local dict[0] ("a") -->
+
+      <DoAction> <actions>
+
+          <!-- DICT 1 -->
+          <Dictionary>
+            <strings> <String value="a"/> </strings>
+          </Dictionary>
+
+          <!-- Push DICT1[0] -->
+          <PushData>
+            <items> <StackDictionaryLookup index="0"/> </items>
+          </PushData>
+          <!-- <Duplicate/> <Trace/> -->
+
+          <EndAction/>
+
+      </actions> </DoAction>
+
+      <ShowFrame/>
+
+      <!-- FRAME 2 : define another dict, call FRAME1, use local dict -->
+
+      <DoAction> <actions>
+
+          <!-- DICT 2 -->
+          <Dictionary>
+            <strings> <String value="b"/> </strings>
+          </Dictionary>
+
+          <!-- Call frame 1 -->
+          <PushData>
+            <items> <StackString value="1"/> </items>
+          </PushData>
+          <CallFrame/>
+
+          <!-- Push DICT2[0] -->
+          <PushData>
+            <items> <StackDictionaryLookup index="0"/> </items>
+          </PushData>
+
+          <Stop/> 
+
+          <AddTyped/> <!-- Expect: aab -->
+          <Duplicate/> 
+          <Trace/> 
+
+          <!-- Verify the stack contains 'ab' -->
+          <PushData> <items> <StackString value="ab"/> </items> </PushData>
+          <EqualTyped/>
+
+          <!-- If true, jump to PASSED tracing -->
+          <BranchIfTrue byteOffset="51"/>
+
+          <!-- Else, trace FAILED -->
+          <PushData> <items>
+              <StackString value="FAILED: expected 'ab' on call frame...  "/>
+          </items> </PushData>
+          <Trace/>
+
+          <BranchAlways byteOffset="44"/> <!-- get to end -->
+
+          <!-- PASSED tracing -->
+          <PushData>
+            <items>
+              <StackString value="PASSED: callframe with dicts is fine  "/>
+            </items>
+          </PushData>
+          <Trace/>
+
+          <!-- END OF TEST tag -->
+          <PushData>
+            <items>
+              <StackString value="END OF TEST"/>
+            </items>
+          </PushData>
+          <Trace/>
+
+          <EndAction/>
+
+      </actions> </DoAction>
+
+      <ShowFrame/>
+
+      <End/>
+
+    </tags>
+  </Header>
+</swf>

-----------------------------------------------------------------------

Summary of changes:
 testsuite/misc-swfmill.all/Makefile.am        |    6 ++
 testsuite/misc-swfmill.all/dict_callframe.xml |  107 +++++++++++++++++++++++++
 2 files changed, 113 insertions(+), 0 deletions(-)
 create mode 100644 testsuite/misc-swfmill.all/dict_callframe.xml


hooks/post-receive
-- 
Gnash