aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMark Miller <erights@gmail.com>2011-09-25 11:50:12 -0700
committerMark Miller <erights@gmail.com>2011-09-25 11:50:12 -0700
commitb9bd140cef49021dac3b90de19853fc074b34d99 (patch)
treea3dad841f2b4f3e3985488564cc68b928230b84d /test
parent58740a7088ec22a7c87321349b5fc35fa53ed6fa (diff)
parent5e0a22f4204b764663047b335076cbddda9f6062 (diff)
Merged
Diffstat (limited to 'test')
-rw-r--r--test/harness/gs.js3
-rw-r--r--test/suite/converted/.DS_Storebin6148 -> 0 bytes
2 files changed, 2 insertions, 1 deletions
diff --git a/test/harness/gs.js b/test/harness/gs.js
index 0fad6625d..18e75f8f1 100644
--- a/test/harness/gs.js
+++ b/test/harness/gs.js
@@ -22,7 +22,8 @@
//An exception is expected
if (testDescrip.negative !== undefined) {
- testDescrip.negative = testDescrip.negative !== "" ? testDescrip.negative : ".";
+ //TODO - come up with a generic way of catching the error type from window.onerror
+ testDescrip.negative = testDescrip.negative === "NotEarlyError" ? testDescrip.negative : ".";
if (window.iframeError === undefined) { //no exception was thrown
testRun(testDescrip.id, testDescrip.path, testDescrip.description, testDescrip.code,
'fail',
diff --git a/test/suite/converted/.DS_Store b/test/suite/converted/.DS_Store
deleted file mode 100644
index 41b8701a6..000000000
--- a/test/suite/converted/.DS_Store
+++ /dev/null
Binary files differ