Adjust the test for bug 713944 to work in the browser and reenable it there. r=unbust
authorJeff Walden <jwalden@mit.edu>
Fri, 30 Dec 2011 21:23:36 -0600
changeset 83600 6dc6795b4479cdd213ffaa00b56b6f584ac56835
parent 83599 0d642e4e08cf26daa6edcc91ad22a435c40176d6
child 83601 0ca69b1af85d6211d722328212843c25f17c0f1f
push id4494
push userjwalden@mit.edu
push dateSat, 31 Dec 2011 03:28:06 +0000
treeherdermozilla-inbound@6dc6795b4479 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersunbust
bugs713944
milestone12.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Adjust the test for bug 713944 to work in the browser and reenable it there. r=unbust
js/src/tests/ecma_5/Object/jstests.list
js/src/tests/ecma_5/Object/proto-property-change-writability-set.js
--- a/js/src/tests/ecma_5/Object/jstests.list
+++ b/js/src/tests/ecma_5/Object/jstests.list
@@ -33,17 +33,17 @@ skip-if(!xulRuntime.shell) script 15.2.3
 skip-if(!xulRuntime.shell) script 15.2.3.6-dictionary-redefinition-4-of-8.js # uses shell load() function
 skip-if(!xulRuntime.shell) script 15.2.3.6-dictionary-redefinition-5-of-8.js # uses shell load() function
 skip-if(!xulRuntime.shell) script 15.2.3.6-dictionary-redefinition-6-of-8.js # uses shell load() function
 skip-if(!xulRuntime.shell) script 15.2.3.6-dictionary-redefinition-7-of-8.js # uses shell load() function
 skip-if(!xulRuntime.shell) script 15.2.3.6-dictionary-redefinition-8-of-8.js # uses shell load() function
 script 15.2.3.6-define-over-method.js
 script mutation-prevention-methods.js
 script object-toString-01.js
-skip script proto-property-change-writability-set.js # needs browser/shell fixup, happening shortly
+script proto-property-change-writability-set.js
 script vacuous-accessor-unqualified-name.js
 script add-property-non-extensible.js
 skip-if(!xulRuntime.shell) script freeze-global-eval-const.js # uses evalcx
 script preventExtensions-idempotent.js
 script isPrototypeOf.js
 script propertyIsEnumerable.js
 script toLocaleString.js
 script gOPD-vs-prototype-accessor.js
--- a/js/src/tests/ecma_5/Object/proto-property-change-writability-set.js
+++ b/js/src/tests/ecma_5/Object/proto-property-change-writability-set.js
@@ -2,36 +2,48 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  * Contributors:
  *   Gary Kwong
  *   Jeff Walden
  *   Jason Orendorff
  */
 
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 713944;
+var summary =
+  "Don't assert anything about a shape from the property cache until it's " +
+  "known the cache entry matches";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
 var accDesc = { set: function() {} };
 var dataDesc = { value: 3 };
 
 function f()
 {
-  constructor = {};
+  propertyIsEnumerable = {};
 }
 function g()
 {
-  constructor = {};
+  propertyIsEnumerable = {};
 }
 
-Object.defineProperty(Object.prototype, "constructor", accDesc);
+Object.defineProperty(Object.prototype, "propertyIsEnumerable", accDesc);
 f();
-Object.defineProperty(Object.prototype, "constructor", dataDesc);
-assertEq(constructor, 3);
+Object.defineProperty(Object.prototype, "propertyIsEnumerable", dataDesc);
+assertEq(propertyIsEnumerable, 3);
 f();
-assertEq(constructor, 3);
+assertEq(propertyIsEnumerable, 3);
 g();
-assertEq(constructor, 3);
+assertEq(propertyIsEnumerable, 3);
 
 
 
 var a = { p1: 1, p2: 2 };
 var b = Object.create(a);
 Object.defineProperty(a, "p1", {set: function () {}});
 for (var i = 0; i < 2; i++)
 {