Merge.

2011-09-25 10:48:00 -07:00 · 2011-09-25 10:48:00 -07:00 · a8e88a93dd
parent e691523b51 d5bf95c628
commit a8e88a93dd
2 changed files with 2 additions and 1 deletions
--- 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', 
--- a/test/suite/converted/.DS_Store
+++ b/test/suite/converted/.DS_Store