From a6fad62d7c314466c50a198a786abd90c08ca17a Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Fri, 19 Feb 2016 11:27:31 -0800
Subject: [PATCH] Last minute fixes
---
harness/proxyTrapsHelper.js | 2 +-
test/harness/proxytrapshelper-overrides.js | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/harness/proxyTrapsHelper.js b/harness/proxyTrapsHelper.js
index 43781b27b7..04a504b85e 100644
--- a/harness/proxyTrapsHelper.js
+++ b/harness/proxyTrapsHelper.js
@@ -3,7 +3,7 @@ function allowProxyTraps(overrides) {
return function () { throw new Test262Error(msg); };
}
if (!overrides) { overrides = {}; }
- var traps = {
+ return {
getPrototypeOf: overrides.getPrototypeOf || throwTest262Error('[[GetPrototypeOf]] trap called'),
setPrototypeOf: overrides.setPrototypeOf || throwTest262Error('[[SetPrototypeOf]] trap called'),
isExtensible: overrides.isExtensible || throwTest262Error('[[IsExtensible]] trap called'),
diff --git a/test/harness/proxytrapshelper-overrides.js b/test/harness/proxytrapshelper-overrides.js
index 4f902bb2e6..4abf5730e5 100644
--- a/test/harness/proxytrapshelper-overrides.js
+++ b/test/harness/proxytrapshelper-overrides.js
@@ -35,8 +35,9 @@ function assertTrapSucceeds(trap) {
var threw = false;
try {
traps[trap]();
+ } catch (e) {
threw = true;
- } catch (e) {}
+ }
if (threw) {
throw new Test262Error('trap ' + trap + ' threw an error');
}
--
GitLab