From 0c29e6de86a969ce753d4b2566f0cb8499de007d Mon Sep 17 00:00:00 2001
From: Mike Pennisi <mike@mikepennisi.com>
Date: Sat, 28 May 2016 16:27:05 -0400
Subject: [PATCH] Reformat miscellaneous negative tests

The expected errors in these tests cannot be asserted with the
`assert.throws` helper function for various reasons. Re-format their
meta-data according to the latest design in order to more precisely
describe test expectations.
---
 test/annexB/language/comments/multi-line-html-close.js      | 4 +++-
 test/annexB/language/comments/single-line-html-close-asi.js | 4 +++-
 test/annexB/language/comments/single-line-html-close.js     | 4 +++-
 test/annexB/language/comments/single-line-html-open.js      | 4 +++-
 test/language/module-code/eval-export-dflt-expr-err-eval.js | 4 +++-
 test/language/module-code/eval-rqstd-abrupt.js              | 4 +++-
 test/language/module-code/eval-self-abrupt.js               | 4 +++-
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/test/annexB/language/comments/multi-line-html-close.js b/test/annexB/language/comments/multi-line-html-close.js
index 22a8b173ad..5ddd86c57e 100644
--- a/test/annexB/language/comments/multi-line-html-close.js
+++ b/test/annexB/language/comments/multi-line-html-close.js
@@ -17,7 +17,9 @@ info: |
 
     HTMLCloseComment ::
       WhiteSpaceSequence[opt] SingleLineDelimitedCommentSequence[opt] --> SingleLineCommentChars[opt]
-negative: Test262Error
+negative:
+  phase: runtime
+  type: Test262Error
 ---*/
 
 var counter = 0;
diff --git a/test/annexB/language/comments/single-line-html-close-asi.js b/test/annexB/language/comments/single-line-html-close-asi.js
index d689436f1f..86380d824c 100644
--- a/test/annexB/language/comments/single-line-html-close-asi.js
+++ b/test/annexB/language/comments/single-line-html-close-asi.js
@@ -19,7 +19,9 @@ info: |
 
     HTMLCloseComment ::
       WhiteSpaceSequence[opt] SingleLineDelimitedCommentSequence[opt] --> SingleLineCommentChars[opt]
-negative: Test262Error
+negative:
+  phase: runtime
+  type: Test262Error
 ---*/
 
 var foo = [23]
diff --git a/test/annexB/language/comments/single-line-html-close.js b/test/annexB/language/comments/single-line-html-close.js
index 3066811894..8ffc317007 100644
--- a/test/annexB/language/comments/single-line-html-close.js
+++ b/test/annexB/language/comments/single-line-html-close.js
@@ -17,7 +17,9 @@ info: |
 
     HTMLCloseComment ::
       WhiteSpaceSequence[opt] SingleLineDelimitedCommentSequence[opt] --> SingleLineCommentChars[opt]
-negative: Test262Error
+negative:
+  phase: runtime
+  type: Test262Error
 ---*/
 
 var counter = 0;
diff --git a/test/annexB/language/comments/single-line-html-open.js b/test/annexB/language/comments/single-line-html-open.js
index ae7188a702..39bab3b4f7 100644
--- a/test/annexB/language/comments/single-line-html-open.js
+++ b/test/annexB/language/comments/single-line-html-open.js
@@ -14,7 +14,9 @@ info: |
 
     SingleLineHTMLOpenComment ::
       <!--SingleLineCommentCharsopt
-negative: Test262Error
+negative:
+  phase: runtime
+  type: Test262Error
 ---*/
 
 var counter = 0;
diff --git a/test/language/module-code/eval-export-dflt-expr-err-eval.js b/test/language/module-code/eval-export-dflt-expr-err-eval.js
index 5e8c31ed58..1363183194 100644
--- a/test/language/module-code/eval-export-dflt-expr-err-eval.js
+++ b/test/language/module-code/eval-export-dflt-expr-err-eval.js
@@ -24,7 +24,9 @@ info: |
     2. If Type(V) is not Reference, return V.
     3. Let base be GetBase(V).
     4. If IsUnresolvableReference(V) is true, throw a ReferenceError exception.
-negative: Test262Error
+negative:
+  phase: runtime
+  type: Test262Error
 flags: [module]
 ---*/
 
diff --git a/test/language/module-code/eval-rqstd-abrupt.js b/test/language/module-code/eval-rqstd-abrupt.js
index b52242627f..8ae152231e 100644
--- a/test/language/module-code/eval-rqstd-abrupt.js
+++ b/test/language/module-code/eval-rqstd-abrupt.js
@@ -10,7 +10,9 @@ info: |
        module.[[RequestedModules]] do,
        a. Let requiredModule be ? HostResolveImportedModule(module, required).
        b. Perform ? requiredModule.ModuleEvaluation().
-negative: TypeError
+negative:
+  phase: early
+  type: TypeError
 flags: [module]
 ---*/
 
diff --git a/test/language/module-code/eval-self-abrupt.js b/test/language/module-code/eval-self-abrupt.js
index bb23cb268c..c80cd28d9b 100644
--- a/test/language/module-code/eval-self-abrupt.js
+++ b/test/language/module-code/eval-self-abrupt.js
@@ -10,7 +10,9 @@ info: |
     18. Resume the context that is now on the top of the execution context
         stack as the running execution context.
     19. Return Completion(result).
-negative: Test262Error
+negative:
+  phase: runtime
+  type: Test262Error
 flags: [module]
 ---*/