Reviewers: Jakob,
Description:
Merged r21062, r21063 into 3.25 branch.
disable Object.observe
Adapt more test expectations
LOG=N
[email protected]
Please review this at https://codereview.chromium.org/266643007/
SVN Base: https://v8.googlecode.com/svn/branches/3.25
Affected files (+18, -4 lines):
M src/object-observe.js
M src/version.cc
M test/cctest/cctest.status
M test/mjsunit/mjsunit.status
M test/webkit/fast/js/Object-getOwnPropertyNames-expected.txt
Index: src/object-observe.js
diff --git a/src/object-observe.js b/src/object-observe.js
index
e822f0bd497588715e70c3300737b9e72a8e9134..1899fe943504533e5a1e967aef8d39350c5a2c1d
100644
--- a/src/object-observe.js
+++ b/src/object-observe.js
@@ -650,4 +650,5 @@ function SetupObjectObserve() {
));
}
-SetupObjectObserve();
+// Disable Object.observe API for M35.
+// SetupObjectObserve();
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
576b508e9df2d9ad8e3366d63b7e53369a86738b..44b1a203fd80167e628c635cef4c0ea2ceeb39db
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 25
#define BUILD_NUMBER 28
-#define PATCH_LEVEL 15
+#define PATCH_LEVEL 16
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: test/cctest/cctest.status
diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status
index
2f09743e257313baebc4654bc42b5efdbd577dc1..1750efb5f249058d288663645357aac953744297
100644
--- a/test/cctest/cctest.status
+++ b/test/cctest/cctest.status
@@ -75,6 +75,10 @@
'test-api/Threading3': [PASS, ['mode == debug', SLOW]],
'test-api/Threading4': [PASS, ['mode == debug', SLOW]],
'test-strings/StringOOM*': [PASS, ['mode == debug', SKIP]],
+
+ # Object.observe is disabled.
+ 'test-object-observe/*': [SKIP],
+ 'test-microtask-delivery/*': [SKIP],
}], # ALWAYS
##############################################################################
Index: test/mjsunit/mjsunit.status
diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status
index
4ff0a1de932330c56d6e86eabddd5a4eec909d50..de9f368de4b12db29936d7f74db78db93d3c6b63
100644
--- a/test/mjsunit/mjsunit.status
+++ b/test/mjsunit/mjsunit.status
@@ -118,6 +118,15 @@
# BUG(v8:2989). PASS/FAIL on linux32 because crankshaft is turned off for
# nosse2. Also for arm novfp3.
'regress/regress-2989': [FAIL, NO_VARIANTS, ['system == linux and arch
== ia32 or arch == arm and simulator == True', PASS]],
+
+ # Object.observe is disabled.
+ 'es6/promises': [SKIP],
+ 'array-push7': [SKIP],
+ 'harmony/microtask-delivery': [SKIP],
+ 'es7/object-observe': [SKIP],
+ 'harmony/regress/regress-observe-empty-double-array': [SKIP],
+ 'regress/regress-356589': [SKIP],
+ 'regress/regress-observe-map-cache': [SKIP],
}], # ALWAYS
##############################################################################
Index: test/webkit/fast/js/Object-getOwnPropertyNames-expected.txt
diff --git a/test/webkit/fast/js/Object-getOwnPropertyNames-expected.txt
b/test/webkit/fast/js/Object-getOwnPropertyNames-expected.txt
index
52babed028590bec48ce12668b23f2fe46cdc097..b8c4bec106ec3ba7414dec4e0351fba57ac9d9ac
100644
--- a/test/webkit/fast/js/Object-getOwnPropertyNames-expected.txt
+++ b/test/webkit/fast/js/Object-getOwnPropertyNames-expected.txt
@@ -63,11 +63,11 @@ FAIL getSortedOwnPropertyNames(decodeURI) should be
length,name. Was arguments,c
FAIL getSortedOwnPropertyNames(decodeURIComponent) should be length,name.
Was arguments,caller,length,name.
FAIL getSortedOwnPropertyNames(encodeURI) should be length,name. Was
arguments,caller,length,name.
FAIL getSortedOwnPropertyNames(encodeURIComponent) should be length,name.
Was arguments,caller,length,name.
-FAIL getSortedOwnPropertyNames(Object) should be
create,defineProperties,defineProperty,freeze,getOwnPropertyDescriptor,getOwnPropertyNames,getPrototypeOf,isExtensible,isFrozen,isSealed,keys,length,name,preventExtensions,prototype,seal,setPrototypeOf.
Was
arguments,caller,create,defineProperties,defineProperty,deliverChangeRecords,freeze,getNotifier,getOwnPropertyDescriptor,getOwnPropertyNames,getPrototypeOf,is,isExtensible,isFrozen,isSealed,keys,length,name,observe,preventExtensions,prototype,seal,setPrototypeOf,unobserve.
+FAIL getSortedOwnPropertyNames(Object) should be
create,defineProperties,defineProperty,freeze,getOwnPropertyDescriptor,getOwnPropertyNames,getPrototypeOf,isExtensible,isFrozen,isSealed,keys,length,name,preventExtensions,prototype,seal,setPrototypeOf.
Was
arguments,caller,create,defineProperties,defineProperty,freeze,getOwnPropertyDescriptor,getOwnPropertyNames,getPrototypeOf,is,isExtensible,isFrozen,isSealed,keys,length,name,preventExtensions,prototype,seal,setPrototypeOf.
PASS getSortedOwnPropertyNames(Object.prototype) is
['__defineGetter__', '__defineSetter__', '__lookupGetter__', '__lookupSetter__', '__proto__', 'constructor', 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable', 'toLocaleString', 'toString', 'valueOf']
FAIL getSortedOwnPropertyNames(Function) should be length,name,prototype.
Was arguments,caller,length,name,prototype.
FAIL getSortedOwnPropertyNames(Function.prototype) should be
apply,bind,call,constructor,length,name,toString. Was
apply,arguments,bind,call,caller,constructor,length,name,toString.
-FAIL getSortedOwnPropertyNames(Array) should be
isArray,length,name,prototype. Was
arguments,caller,isArray,length,name,observe,prototype,unobserve.
+FAIL getSortedOwnPropertyNames(Array) should be
isArray,length,name,prototype. Was
arguments,caller,isArray,length,name,prototype.
PASS getSortedOwnPropertyNames(Array.prototype) is
['concat', 'constructor', 'every', 'filter', 'forEach', 'indexOf', 'join', 'lastIndexOf', 'length', 'map', 'pop', 'push', 'reduce', 'reduceRight', 'reverse', 'shift', 'slice', 'some', 'sort', 'splice', 'toLocaleString', 'toString', 'unshift']
FAIL getSortedOwnPropertyNames(String) should be
fromCharCode,length,name,prototype. Was
arguments,caller,fromCharCode,length,name,prototype.
PASS getSortedOwnPropertyNames(String.prototype) is
['anchor', 'big', 'blink', 'bold', 'charAt', 'charCodeAt', 'concat', 'constructor', 'fixed', 'fontcolor', 'fontsize', 'indexOf', 'italics', 'lastIndexOf', 'length', 'link', 'localeCompare', 'match', 'normalize', 'replace', 'search', 'slice', 'small', 'split', 'strike', 'sub', 'substr', 'substring', 'sup', 'toLocaleLowerCase', 'toLocaleUpperCase', 'toLowerCase', 'toString', 'toUpperCase', 'trim', 'trimLeft', 'trimRight', 'valueOf']
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
