[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/avm2 r9741: always enable avm2 in this bra
|
From: |
rob |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/avm2 r9741: always enable avm2 in this branch. |
|
Date: |
Sat, 16 May 2009 12:30:02 -0600 |
|
User-agent: |
Bazaar (1.13.1) |
------------------------------------------------------------
revno: 9741
committer: address@hidden
branch nick: avm2
timestamp: Sat 2009-05-16 12:30:02 -0600
message:
always enable avm2 in this branch.
modified:
configure.ac
libcore/Makefile.am
libcore/parser/Makefile.am
libcore/vm/Machine.cpp
libcore/vm/Machine.h
libcore/vm/Makefile.am
testsuite/as3/classes.all/Makefile.am
testsuite/as3/classes.all/sampler/DeleteObjectSample_as3.hx
testsuite/as3/classes.all/sampler/NewObjectSample_as3.hx
testsuite/libcore.all/Makefile.am
testsuite/misc-haxe.all/Makefile.am
=== modified file 'configure.ac'
--- a/configure.ac 2009-05-16 17:04:07 +0000
+++ b/configure.ac 2009-05-16 18:30:02 +0000
@@ -214,9 +214,11 @@
SOLDIR=${soldir}
AC_SUBST(SOLDIR)
-AM_CONDITIONAL(ENABLE_AVM2, [true])
+dnl always enable avm2 in this branch
AC_DEFINE(ENABLE_AVM2, [1], [Enable AVM2 code])
+dnl This option is only used if you want Gnash to interwork with
+dnl the Adobe player using the LocalConnection class.
dnl lckey=0xdd3adabd
AC_ARG_WITH(lckey,
AC_HELP_STRING([--with-lckey],
=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am 2009-05-15 03:20:50 +0000
+++ b/libcore/Makefile.am 2009-05-16 18:30:02 +0000
@@ -126,12 +126,10 @@
$(FREETYPE_SOURCES) \
$(NULL)
-if ENABLE_AVM2
libgnashcore_la_SOURCES += \
abc_function.cpp \
asMethod.cpp
$(NULL)
-endif
noinst_HEADERS = \
URLAccessManager.h \
@@ -194,7 +192,6 @@
Video.h \
$(NULL)
-if ENABLE_AVM2
noinst_HEADERS += \
swf/DoABCTag.h \
abc_function.h \
@@ -202,7 +199,6 @@
asException.h \
asBoundValues.h \
$(NULL)
-endif
EXTENSIONS_API = \
as_object.h \
=== modified file 'libcore/parser/Makefile.am'
--- a/libcore/parser/Makefile.am 2009-05-14 15:02:29 +0000
+++ b/libcore/parser/Makefile.am 2009-05-16 18:30:02 +0000
@@ -50,10 +50,8 @@
sound_definition.cpp \
sprite_definition.cpp
-if ENABLE_AVM2
libgnashparser_la_SOURCES += \
abc_block.cpp
-endif
noinst_HEADERS = \
action_buffer.h \
@@ -63,10 +61,8 @@
sound_definition.h \
sprite_definition.h
-if ENABLE_AVM2
noinst_HEADERS += \
abc_block.h
-endif
EXTENSIONS_API = \
movie_definition.h \
=== modified file 'libcore/vm/Machine.cpp'
--- a/libcore/vm/Machine.cpp 2009-05-15 03:20:50 +0000
+++ b/libcore/vm/Machine.cpp 2009-05-16 18:30:02 +0000
@@ -29,7 +29,6 @@
#include "Object.h"
#include "VM.h"
-//#define PRETEND
namespace gnash {
/// The type of exceptions thrown by ActionScript.
class ASException
@@ -81,7 +80,7 @@
pool_double(boost::uint32_t index, abc_block *pool)
{
if (!pool) throw ASException();
- LOG_DEBUG_AVM("Getting double from pool at index %u",index);
+ log_abc("Getting double from pool at index %u",index);
return pool->doublePoolAt(index);
}
@@ -113,7 +112,7 @@
if (!pool) throw ASException();
asName multiname = pool->multinamePoolAt(index);
#if 0
- LOG_DEBUG_AVM("Searching multiname pool for property id=%u abc name=%u "
+ log_abc("Searching multiname pool for property id=%u abc name=%u "
"global name = %u abc string=%s flags=0x%X name_space=%u",
index, multiname.getABCName(), multiname.getGlobalName(),
pool->mStringPool[multiname.getABCName()],multiname.mFlags | 0x0,
@@ -254,7 +253,7 @@
{
SWF::abc_action_type opcode = (SWF::abc_action_type)mStream->read_as3op();
- LOG_DEBUG_AVM("** Executing opcode: %s (%d) **", opcode, (int)opcode);
+ log_abc("** Executing opcode: %s (%d) **", opcode, (int)opcode);
// continue;
switch ((opcode /*= mStream->read_as3op()*/)) // Assignment intentional
{
@@ -460,7 +459,7 @@
case SWF::ABC_ACTION_JUMP:
{
boost::int32_t bytes = mStream->read_S24();
- LOG_DEBUG_AVM("Jumping %d bytes.",bytes);
+ log_abc("Jumping %d bytes.",bytes);
mStream->seekBy(bytes);
break;
@@ -477,11 +476,11 @@
{
boost::int32_t bytes = mStream->read_S24();
if (pop_stack().to_bool()) {
- LOG_DEBUG_AVM("Jumping %d bytes.",bytes);
+ log_abc("Jumping %d bytes.",bytes);
mStream->seekBy(bytes);
}
else{
- LOG_DEBUG_AVM("Would have jumpied %d bytes.", bytes);
+ log_abc("Would have jumpied %d bytes.", bytes);
}
break;
}
@@ -497,8 +496,8 @@
boost::int32_t bytes = mStream->read_S24();
bool truth = pop_stack().to_bool();
if (!truth) {
- LOG_DEBUG_AVM("Jumping...");
- LOG_DEBUG_AVM("%d bytes.",bytes);
+ log_abc("Jumping...");
+ log_abc("%d bytes.",bytes);
mStream->seekBy(bytes);
}
break;
@@ -517,11 +516,11 @@
as_value b = pop_stack();
as_value a = pop_stack();
if (a.equals(b)) {
- LOG_DEBUG_AVM("Jumping %d bytes.",bytes);
+ log_abc("Jumping %d bytes.",bytes);
mStream->seekBy(bytes);
}
else{
- LOG_DEBUG_AVM("Would have jumped %d bytes", bytes);
+ log_abc("Would have jumped %d bytes", bytes);
}
break;
}
@@ -539,11 +538,11 @@
as_value b = pop_stack();
boost::int32_t bytes = mStream->read_S24();
if (!a.equals(b)) {
- LOG_DEBUG_AVM("Jumping... %d bytes.",bytes);
+ log_abc("Jumping... %d bytes.",bytes);
mStream->seekBy(bytes);
}
else{
- LOG_DEBUG_AVM("Would have jumped %d bytes",bytes);
+ log_abc("Would have jumped %d bytes",bytes);
}
break;
}
@@ -562,11 +561,11 @@
boost::int32_t bytes = mStream->read_S24();
bool jump = a.newLessThan(b).to_bool();
if (jump) {
- LOG_DEBUG_AVM("Jumping... %d bytes.",bytes);
+ log_abc("Jumping... %d bytes.",bytes);
mStream->seekBy(bytes);
}
else{
- LOG_DEBUG_AVM("Would have jumped %d bytes",bytes);
+ log_abc("Would have jumped %d bytes",bytes);
}
break;
}
@@ -602,11 +601,11 @@
ABSTRACT_COMPARE(truth, mStack.top(0), mStack.top(1), false);
mStack.drop(2);
if (truth) {
- LOG_DEBUG_AVM("Jumping %d bytes.",bytes);
+ log_abc("Jumping %d bytes.",bytes);
mStream->seekBy(bytes);
}
else{
- LOG_DEBUG_AVM("Would have jumped %d bytes.",bytes);
+ log_abc("Would have jumped %d bytes.",bytes);
}
break;
}
@@ -977,15 +976,15 @@
boost::int32_t iindex = mStream->read_V32();
as_value &objv = mRegisters[oindex];
as_value &indexv = mRegisters[iindex];
- LOG_DEBUG_AVM("Index is %u",indexv.to_number());
+ log_abc("Index is %u",indexv.to_number());
// ENSURE_OBJECT(objv);
// ENSURE_NUMBER(indexv);
as_object *obj = objv.to_object().get();
boost::uint32_t index = indexv.to_number<boost::uint32_t>();
- LOG_DEBUG_AVM("Object is %s index is
%u",objv.toDebugString(),index);
+ log_abc("Object is %s index is %u",objv.toDebugString(),index);
as_object *owner = NULL;
int next = obj->nextIndex(index, &owner);
- LOG_DEBUG_AVM("Next index is %d",next);
+ log_abc("Next index is %d",next);
// mStack.grow(1);
if (next)
{
@@ -1014,7 +1013,7 @@
case SWF::ABC_ACTION_NEWFUNCTION:
{
boost::int32_t method_index = mStream->read_V32();
- LOG_DEBUG_AVM("Creating new abc_function: method
index=%u",method_index);
+ log_abc("Creating new abc_function: method
index=%u",method_index);
asMethod *m = pool_method(method_index, mPoolObject);
abc_function* new_function = m->getPrototype();
// TODO: SafeStack contains all the scope objects
@@ -1175,43 +1174,47 @@
boost::uint32_t argc = mStream->read_V32();
std::auto_ptr< std::vector<as_value> > args = get_args(argc);
//TODO: If multiname is runtime also pop namespace and/or name
values.
- if ( a.isRuntime() ) {
- log_unimpl("ABC_ACTION_CALL* with runtime multiname");
- }
+
+ if (a.isRuntime()) {
+ log_unimpl("ABC_ACTION_CALL* with runtime multiname");
+ }
+
as_value object_val = pop_stack();
-
+
as_object *object = object_val.to_object().get();
if (!object) {
- IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("Can't call a method of a value that
doesn't cast to an object (%s)."),
- object_val);
- )
- }
- else{
+ IF_VERBOSE_ASCODING_ERRORS(
+ log_aserror(_("Can't call a method of a value that
doesn't "
+ "cast to an object (%s)."),
+ object_val);
+ )
+ }
+ else {
- as_value property =
object->getMember(a.getGlobalName(),0);
+ as_value property =
object->getMember(a.getGlobalName(), 0);
if (!property.is_undefined() && !property.is_null()) {
- LOG_DEBUG_AVM("Calling method %s on object %s",
+ log_abc("Calling method %s on object %s",
property.toDebugString(),object_val.toDebugString());
as_environment env = as_environment(_vm);
result = call_method(property,env,object,args);
}
- else{
- IF_VERBOSE_ASCODING_ERRORS(
+ else {
+ IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Property '%s' of object '%s' is
'%s', "
- "cannot call as method"),
-
mPoolObject->stringPoolAt(a.getABCName()),
- object_val, property);
- )
- }
-
+ "cannot call as method"),
+ mPoolObject->stringPoolAt(a.getABCName()),
+ object_val, property);
+ )
+ }
+
}
- if (opcode == SWF::ABC_ACTION_CALLPROPERTY) {
- push_stack(result);
- }
-
+
+ if (opcode == SWF::ABC_ACTION_CALLPROPERTY) {
+ push_stack(result);
+ }
+
/* int shift = completeName(a, argc);
ENSURE_OBJECT(mStack.top(shift + argc));
as_object *obj = mStack.top(argc + shift).to_object().get();
@@ -1291,35 +1294,37 @@
case SWF::ABC_ACTION_CONSTRUCTSUPER:
{
boost::uint32_t argc = mStream->read_V32();
- LOG_DEBUG_AVM("There are %u arguments.",argc);
+ log_abc("There are %u arguments.",argc);
get_args(argc);
-// ENSURE_OBJECT(mStack.top(argc));
//as_object *super = pop_stack().to_object().get()->get_super();
//TODO: Actually construct the super.
-// as_object *super = mStack.top(argc).to_object()->get_super();
-// if (!super)
-// {
-// throw ASException();
-// break;
-// }
-// as_function *func = super->get_constructor();
+ as_object* super = mStack.top(argc).to_object()->get_super();
+ if (!super) {
+ log_error("No super found in CONSTRUCTSUPER!");
+ throw ASException();
+ }
+ as_function *func = super->get_constructor();
+ if (!func) {
+ log_abc("Super(%s) has no constructor in CONSTRUCTSUPER!");
+ }
// 'obj' is the 'this' for the call, we ignore the return,
there are
// argc arguments, and we drop all of the arguments plus 'obj'
from
// the stack.
-// pushCall(func, obj, mIgnoreReturn, argc, -1);
+ pushCall(func, super, mIgnoreReturn, argc, -1);
- LOG_ONCE( log_unimpl("ABC_ACTION_CONSTRUCTSUPER") );
+ LOG_ONCE(log_unimpl("ABC_ACTION_CONSTRUCTSUPER") );
break;
}
-/// 0x4A ABC_ACTION_CONSTRUCTPROP
-/// Stream: V32 'name_offset' | V32 'arg_count'
-/// Stack In:
-/// argN ... arg1 -- the arg_count arguments to pass
-/// [ns [n]] -- Namespace stuff
-/// obj -- the object whose property should be constructed
-/// Stack Out:
-/// value -- the newly constructed prop from obj::(resolve)
-/// 'name_offset'(arg1, ..., argN)
+
+ /// 0x4A ABC_ACTION_CONSTRUCTPROP
+ /// Stream: V32 'name_offset' | V32 'arg_count'
+ /// Stack In:
+ /// argN ... arg1 -- the arg_count arguments to pass
+ /// [ns [n]] -- Namespace stuff
+ /// obj -- the object whose property should be constructed
+ /// Stack Out:
+ /// value -- the newly constructed prop from obj::(resolve)
+ /// 'name_offset'(arg1, ..., argN)
case SWF::ABC_ACTION_CONSTRUCTPROP:
{
as_environment env = as_environment(_vm);
@@ -1329,7 +1334,7 @@
as_object* object = pop_stack().to_object().get();
if (!object) {
//TODO: Should this result in an exeception or an
actionscript error?
- LOG_DEBUG_AVM("Can't constructor property on a null
object. Property not constructed.");
+ log_abc("Can't constructor property on a null object.
Property not constructed.");
push_stack(as_value());
break;
}
@@ -1345,9 +1350,9 @@
// I don't think this is correct, and I think the problem might
be how AVM2 adds
// new objects to the Global object.
else{
- LOG_DEBUG_AVM("Object %s is not a
constructor",constructor_val.toDebugString());
+ log_abc("Object %s is not a
constructor",constructor_val.toDebugString());
if (constructor_val.is_null() ||
constructor_val.is_undefined()) {
- LOG_DEBUG_AVM("Constructor is undefined, will
not construct property.");
+ log_abc("Constructor is undefined, will not
construct property.");
push_stack(as_value());
}
else{
@@ -1399,7 +1404,7 @@
case SWF::ABC_ACTION_NEWARRAY:
{
boost::uint32_t asize = mStream->read_V32();
- LOG_DEBUG_AVM("Creating array of size %u",asize);
+ log_abc("Creating array of size %u",asize);
Array_as *arr = new Array_as;
arr->resize(asize);
boost::uint32_t i = asize;
@@ -1432,7 +1437,7 @@
{
boost::uint32_t cid = mStream->read_V32();
asClass *c = pool_class(cid, mPoolObject);
- LOG_DEBUG_AVM("Creating new class id=%u name=%s", c->getName(),
+ log_abc("Creating new class id=%u name=%s", c->getName(),
mPoolObject->stringPoolAt(c->getName()));
as_object* base_class = pop_stack().to_object().get();
@@ -1609,7 +1614,7 @@
case SWF::ABC_ACTION_SETLOCAL:
{
boost::uint32_t index = mStream->read_V32();
- LOG_DEBUG_AVM("Register index: %u",index);
+ log_abc("Register index: %u",index);
mRegisters[index] = pop_stack();
break;
}
@@ -1734,7 +1739,7 @@
object->get_member_slot(sindex + 1, &val);
- LOG_DEBUG_AVM("object has value %s at real_slot=%u
abc_slot=%u",val.toDebugString(),sindex + 1, sindex);
+ log_abc("object has value %s at real_slot=%u
abc_slot=%u",val.toDebugString(),sindex + 1, sindex);
push_stack(val);
break;
@@ -1755,10 +1760,10 @@
//We use sindex + 1, because currently as_object sets a
property at a slot index
//1 higher than the index the abc_block thinks the property is
at.
if (!object.to_object().get()->set_member_slot(sindex+1,value))
{
- LOG_DEBUG_AVM("Failed to set property at real_slot=%u
abc_slot=%u",sindex+1,sindex);
+ log_abc("Failed to set property at real_slot=%u
abc_slot=%u",sindex+1,sindex);
}
else{
- LOG_DEBUG_AVM("Set property at real_slot=%u
abc_slot=%u",sindex+1,sindex);
+ log_abc("Set property at real_slot=%u
abc_slot=%u",sindex+1,sindex);
}
//TODO: Actually set the object's value.
break;
@@ -2484,7 +2489,7 @@
break;
}
} // end of switch statement
- LOG_DEBUG_AVM("* DONE *");
+ log_abc("* DONE *");
IF_VERBOSE_ACTION(print_stack());
} // end of AS3 conditional
else // beginning of !AS3 (this code is AS2)
@@ -2551,15 +2556,16 @@
}
int
-Machine::completeName(asName &name, int offset)
+Machine::completeName(asName& name, int offset)
{
int size = 0;
if (name.isRuntime())
{
as_value obj = mStack.top(offset);
- if (obj.is_object() && obj.to_object()->isQName())
+ if (obj.is_object() && obj.to_object()->isQName()) {
name.fill(obj.to_object().get());
+ }
++size;
if (name.isRtns())
@@ -2670,7 +2676,7 @@
void
Machine::restoreState()
{
- LOG_DEBUG_AVM("Restoring state.");
+ log_abc("Restoring state.");
State &s = mStateStack.top(0);
s.to_debug_string();
// mStack.setAllSizes(s.mStackTotalSize, s.mStackDepth);
@@ -2691,7 +2697,7 @@
void
Machine::saveState()
{
- LOG_DEBUG_AVM("Saving state.");
+ log_abc("Saving state.");
mStateStack.grow(1);
State &s = mStateStack.top(0);
s.mStackDepth = mStack.getDownstop();
@@ -2774,22 +2780,22 @@
log_debug("instantiateClass: class name %s", className);
- asClass* theClass = mPoolObject->locateClass(className);
- if ( ! theClass )
+ asClass* cl = mPoolObject->locateClass(className);
+ if (!cl)
{
- // TODO: check how the pp would handle this
- IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("Could not locate class '%s' for instantiation",
className);
- );
+ /// This seems like a big error.
+ log_error("Could not locate class '%s' for instantiation", className);
return;
}
- clearRegisters(theClass->getConstructor()->getMaxRegisters());
- mCurrentFunction = theClass->getConstructor()->getPrototype();
+ asMethod* ctor = cl->getConstructor();
+
+ clearRegisters(ctor->getMaxRegisters());
+ mCurrentFunction = ctor->getPrototype();
mStack.clear();
mScopeStack.clear();
mRegisters[0] = as_value(global);
- executeCodeblock(theClass->getConstructor()->getBody());
+ executeCodeblock(ctor->getBody());
}
Machine::Machine(VM& vm)
@@ -2830,7 +2836,7 @@
{
as_object* scope_object = mScopeStack.top(i).get();
if (!scope_object) {
- LOG_DEBUG_AVM("Scope object is NULL.");
+ log_abc("Scope object is NULL.");
continue;
}
val = scope_object->getMember(multiname.getGlobalName(),
@@ -2843,7 +2849,7 @@
}
}
- LOG_DEBUG_AVM("Cannot find property in scope stack. Trying again using
as_environment.");
+ log_abc("Cannot find property in scope stack. Trying again using
as_environment.");
as_object *target = NULL;
as_environment env = as_environment(_vm);
std::string name = mPoolObject->stringPoolAt(multiname.getABCName());
@@ -2902,7 +2908,7 @@
if (i!=0) ss << " | ";
ss << mStack.value(i).toDebugString();
}
- LOG_DEBUG_AVM("%s", ss.str());
+ log_abc("%s", ss.str());
}
void
@@ -2914,13 +2920,13 @@
for (unsigned int i=0;i<mScopeStack.size();++i) {
ss << as_value(mScopeStack.top(i).get()).toDebugString();
}
- LOG_DEBUG_AVM("%s", ss.str());
+ log_abc("%s", ss.str());
}
std::auto_ptr<std::vector<as_value> >
Machine::get_args(unsigned int argc)
{
- LOG_DEBUG_AVM("There are %u args",argc);
+ log_abc("There are %u args",argc);
std::auto_ptr<std::vector<as_value> > args =
std::auto_ptr<std::vector<as_value> >(new std::vector<as_value>);
args->resize(argc);
=== modified file 'libcore/vm/Machine.h'
--- a/libcore/vm/Machine.h 2009-05-14 08:00:05 +0000
+++ b/libcore/vm/Machine.h 2009-05-16 18:30:02 +0000
@@ -272,35 +272,35 @@
void clearRegisters(boost::uint32_t maxRegsiters);
as_value get_register(int index){
- log_abc("Getting value at a register %d ",index);
+ //log_abc("Getting value at a register %d ",index);
return mRegisters[index];
}
void push_stack(as_value object){
- log_abc("Pushing value %s onto stack.",object.toDebugString());
+ //log_abc("Pushing value %s onto
stack.",object.toDebugString());
mStack.push(object);
}
as_value pop_stack(){
as_value value = mStack.pop();
- log_abc("Poping value %s off the stack.",value.toDebugString());
+ //log_abc("Poping value %s off the
stack.",value.toDebugString());
return value;
}
void push_scope_stack(as_value object){
boost::intrusive_ptr<as_object> scopeObj = object.to_object();
assert(scopeObj.get());
- log_abc("Pushing value %s onto scope
stack.",object.toDebugString());
+ //log_abc("Pushing value %s onto scope
stack.",object.toDebugString());
mScopeStack.push(scopeObj);
print_scope_stack();
}
boost::intrusive_ptr<as_object> pop_scope_stack(){
- log_abc("Poping value off the scope stack. There will be %u
items left.",mScopeStack.size()-1);
+ //log_abc("Poping value off the scope stack. There will be %u
items left.",mScopeStack.size()-1);
return mScopeStack.pop();
}
boost::intrusive_ptr<as_object> get_scope_stack(boost::uint8_t depth){
- log_abc("Geting value from scope stack %u from the
bottom.",depth | 0x0);
+ //log_abc("Geting value from scope stack %u from the
bottom.",depth | 0x0);
return mScopeStack.value(depth);
}
=== modified file 'libcore/vm/Makefile.am'
--- a/libcore/vm/Makefile.am 2009-05-14 15:02:29 +0000
+++ b/libcore/vm/Makefile.am 2009-05-16 18:30:02 +0000
@@ -46,12 +46,10 @@
CallStack.cpp \
$(NULL)
-if ENABLE_AVM2
libgnashvm_la_SOURCES += \
CodeStream.cpp \
Machine.cpp
$(NULL)
-endif
noinst_HEADERS = \
ASHandlers.h \
@@ -71,13 +69,11 @@
Machine.h \
$(NULL)
-if ENABLE_AVM2
noinst_HEADERS += \
asName.h \
CodeStream.h \
Machine.h \
$(NULL)
-endif
if SDKINSTALL
noinst_HEADERS += $(EXTENSIONS_API)
=== modified file 'testsuite/as3/classes.all/Makefile.am'
--- a/testsuite/as3/classes.all/Makefile.am 2009-05-16 01:41:34 +0000
+++ b/testsuite/as3/classes.all/Makefile.am 2009-05-16 18:30:02 +0000
@@ -68,7 +68,6 @@
include $(srcdir)/xml/xml.am
#/usr/bin/haxe -swf-version 9 -cp
/home/rob/projects/gnu/gnash-bzr/avm2/testsuite/as3/classes.all -cp
/home/rob/projects/gnu/gnash-bzr/avm2/testsuite/as3/classes.all/media -swf
Sound_as3.swf -main Sound_as3.hx
-
SUFFIXES = hx swf
.hx.swf:
@@ -86,21 +85,3 @@
*_testrunner \
*_Runner
-check-DEJAGNU: site-update $(TEST_CASES)
- @runtest=$(RUNTEST); \
- if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
- GNASH_GC_TRIGGER_THRESHOLD=0 GNASHRC=../gnashrc $$runtest
$(RUNTESTFLAGS) $(TEST_DRIVERS); true; \
- else \
- echo "WARNING: could not find \`runtest'" 1>&2; \
- for i in "$(TEST_CASES)"; do \
- GNASH_GC_TRIGGER_THRESHOLD=0 GNASHRC=../gnashrc $(SHELL) $$i; \
- done; \
- fi
-
-site-update: site.exp
- @rm -fr site.exp.bak
- @cp site.exp site.exp.bak
- @sed -e '/testcases/d' site.exp.bak > site.exp
- @echo "# This is a list of the pre-compiled testcases" >> site.exp
- @echo "set testcases \"$(TEST_CASES)\"" >> site.exp
-
=== modified file 'testsuite/as3/classes.all/sampler/DeleteObjectSample_as3.hx'
--- a/testsuite/as3/classes.all/sampler/DeleteObjectSample_as3.hx
2009-05-15 23:28:45 +0000
+++ b/testsuite/as3/classes.all/sampler/DeleteObjectSample_as3.hx
2009-05-16 18:30:02 +0000
@@ -39,18 +39,21 @@
// Class must be named with the _as3 suffix, as that's the same name as the
file.
class DeleteObjectSample_as3 {
static function main() {
- var x1:DeleteObjectSample = new DeleteObjectSample();
-
- // Make sure we actually get a valid class
- if (x1 != null) {
- DejaGnu.pass("DeleteObjectSample class exists");
- } else {
- DejaGnu.fail("DeleteObjectSample class doesn't exist");
- }
-
-// Tests to see if all the methods exist. All these do is test for
-// existance of a method, and don't test the functionality at all. This
-// is primarily useful only to test completeness of the API implementation.
+
+// HAXE doesn't appear to support the size constant
+// // Make sure we actually get a valid class
+// if (DeleteObjectSample.id != null) {
+// DejaGnu.pass("DeleteObjectSample.id constant exists");
+// } else {
+// DejaGnu.fail("DeleteObjectSample.id constant doesn't exist");
+// }
+
+// HAXE doesn't appear to support the size constant
+// if (DeleteObjectSample.size != null) {
+// DejaGnu.pass("DeleteObjectSample.size constant exists");
+// } else {
+// DejaGnu.fail("DeleteObjectSample.size constant doesn't exist");
+// }
// Call this after finishing all tests. It prints out the totals.
DejaGnu.done();
=== modified file 'testsuite/as3/classes.all/sampler/NewObjectSample_as3.hx'
--- a/testsuite/as3/classes.all/sampler/NewObjectSample_as3.hx 2009-05-15
23:28:45 +0000
+++ b/testsuite/as3/classes.all/sampler/NewObjectSample_as3.hx 2009-05-16
18:30:02 +0000
@@ -47,14 +47,6 @@
} else {
DejaGnu.fail("NewObjectSample class doesn't exist");
}
-// Tests to see if all the properties exist. All these do is test for
-// existance of a property, and don't test the functionality at all. This
-// is primarily useful only to test completeness of the API implementation.
- if (x1.object == *) {
- DejaGnu.pass("NewObjectSample.object property exists");
- } else {
- DejaGnu.fail("NewObjectSample.object property doesn't exist");
- }
// Tests to see if all the methods exist. All these do is test for
// existance of a method, and don't test the functionality at all. This
=== modified file 'testsuite/libcore.all/Makefile.am'
--- a/testsuite/libcore.all/Makefile.am 2009-05-14 15:02:29 +0000
+++ b/testsuite/libcore.all/Makefile.am 2009-05-16 18:30:02 +0000
@@ -47,10 +47,8 @@
SafeStackTest \
$(NULL)
-if ENABLE_AVM2
check_PROGRAMS += \
CodeStreamTest
-endif
CLEANFILES = \
testrun.sum \
=== modified file 'testsuite/misc-haxe.all/Makefile.am'
--- a/testsuite/misc-haxe.all/Makefile.am 2009-05-14 10:26:47 +0000
+++ b/testsuite/misc-haxe.all/Makefile.am 2009-05-16 18:30:02 +0000
@@ -48,11 +48,9 @@
TEST_CASES = \
$(NULL)
-if ENABLE_AVM2
TEST_CASES += \
sanetests-runner \
bogustests-runner
-endif
sanetests-runner: $(srcdir)/../generic-testrunner.sh $(SANE_ASTESTS_OUT)
Makefile
sh $< -c __END_OF_TEST__ -r 50 $(top_builddir) $(SANE_ASTESTS_OUT) > $@
- [Gnash-commit] /srv/bzr/gnash/avm2 r9741: always enable avm2 in this branch.,
rob <=