16 files changed, 433 insertions, 409 deletions
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-1-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-1-s.js
index 3c042e412..9d5386f08 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-1-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-1-s.js
@@ -1,31 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-1-s.js
- * @description with statement in strict mode throws SyntaxError (strict function)
- * @onlyStrict
- */
-
-
-function testcase() {
-
-  try {
-    // wrapping it in eval since this needs to be a syntax error. The
-    // exception thrown must be a SyntaxError exception.
-    eval("\
-          function f() {\
-            \'use strict\';\
-            var o = {}; \
-            with (o) {};\
-          }\
-        ");
-    return false;
-  }
-  catch (e) {
-    return(e instanceof SyntaxError); 
-	}
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with statement in strict mode throws SyntaxError (strict function)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  try {
+    // wrapping it in eval since this needs to be a syntax error. The
+    // exception thrown must be a SyntaxError exception.
+    eval("\
+          function f() {\
+            \'use strict\';\
+            var o = {}; \
+            with (o) {};\
+          }\
+        ");
+    return false;
+  }
+  catch (e) {
+    return(e instanceof SyntaxError); 
+	}
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-10-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-10-s.js
index 4e470b517..e0128a763 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-10-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-10-s.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-10-s.js
- * @description with statement in strict mode throws SyntaxError (eval, where the container function is strict)
- * @onlyStrict
- */
-
-
-function testcase() {
-  'use strict';
-  
-  // wrapping it in eval since this needs to be a syntax error. The
-  // exception thrown must be a SyntaxError exception. Note that eval
-  // inherits the strictness of its calling context.  
-  try {
-    eval("\
-          var o = {};\
-          with (o) {}\
-       ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement in strict mode throws SyntaxError (eval, where the
+    container function is strict)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+  
+  // wrapping it in eval since this needs to be a syntax error. The
+  // exception thrown must be a SyntaxError exception. Note that eval
+  // inherits the strictness of its calling context.  
+  try {
+    eval("\
+          var o = {};\
+          with (o) {}\
+       ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-11-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-11-s.js
index 3c4e81daa..86a193211 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-11-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-11-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-11-s.js
- * @description Strict Mode - SyntaxError is thrown when using WithStatement in strict mode code
- * @onlyStrict
- */
-
-
-function testcase() {
-        "use strict";
-        try {
-            eval("with ({}) { throw new Error();}");
-
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when using WithStatement in
+    strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("with ({}) { throw new Error();}");
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-11gs.js b/test/suite/ch12/12.10/12.10.1/12.10.1-11gs.js
index b40b37236..7e0ff8cea 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-11gs.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-11gs.js
@@ -1,16 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-
-/**
- * @path ch12/12.10/12.10.1/12.10.1-11gs.js
- * @description Strict Mode - SyntaxError is thrown when using with statement
- * @onlyStrict
- * @negative ^((?!NotEarlyError).)*$
- */
-
-"use strict";
-throw NotEarlyError;
-with ({}) { }
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - SyntaxError is thrown when using with statement
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+with ({}) { }
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-12-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-12-s.js
index 0f327297d..511599e5e 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-12-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-12-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-12-s.js
- * @description with statement in strict mode throws SyntaxError (strict eval)
- * @onlyStrict
- */
-
-
-function testcase() {
-  try {
-    eval("\
-          'use strict'; \
-          var o = {}; \
-          with (o) {}\
-        ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError) ;
-  }
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with statement in strict mode throws SyntaxError (strict eval)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    eval("\
+          'use strict'; \
+          var o = {}; \
+          with (o) {}\
+        ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError) ;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-13-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-13-s.js
index 39d56659e..a0ebf38d8 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-13-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-13-s.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-13-s.js
- * @description Strict Mode - SyntaxError isn't thrown when WithStatement body is in strict mode code
- * @noStrict
- */
-
-
-function testcase() {
-        with ({}) {
-            "use strict";
-        }
-        return true;
-    }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError isn't thrown when WithStatement body is
+    in strict mode code
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        with ({}) {
+            "use strict";
+        }
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-14-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-14-s.js
index 0e7e685b7..85b932900 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-14-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-14-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-14-s.js
- * @description Strict Mode - SyntaxError is thrown when the getter of a literal object utilizes WithStatement
- * @onlyStrict
- */
-
-
-function testcase() {
-        "use strict";
-
-        try {
-            eval("var obj = { get: function (a) { with(a){} } }; ");
-
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when the getter of a literal
+    object utilizes WithStatement
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var obj = { get: function (a) { with(a){} } }; ");
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-15-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-15-s.js
index 8621631f6..5ea00618e 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-15-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-15-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-15-s.js
- * @description Strict Mode - SyntaxError is thrown when the RHS of a dot property assignment utilizes WithStatement
- * @onlyStrict
- */
-
-
-function testcase() {
-        "use strict";
-
-        try {
-            eval("var obj = {}; obj.get = function (a) { with(a){} }; ");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when the RHS of a dot property
+    assignment utilizes WithStatement
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var obj = {}; obj.get = function (a) { with(a){} }; ");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-16-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-16-s.js
index e798b5715..95f03117e 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-16-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-16-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-16-s.js
- * @description Strict Mode - SyntaxError is thrown when the RHS of an object indexer assignment utilizes WithStatement
- * @onlyStrict
- */
-
-
-function testcase() {
-        "use strict";
-
-        try {
-            eval("var obj = {}; obj['get'] = function (a) { with(a){} };  ");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when the RHS of an object
+    indexer assignment utilizes WithStatement
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var obj = {}; obj['get'] = function (a) { with(a){} };  ");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-2-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-2-s.js
index 211a1386e..366ef438e 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-2-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-2-s.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-2-s.js
- * @description with statement in strict mode throws SyntaxError (nested function where container is strict)
- * @onlyStrict
- */
-
-
-function testcase() {
-  try {
-    // wrapping it in eval since this needs to be a syntax error. The
-    // exception thrown must be a SyntaxError exception.
-    eval("\
-          function foo() {\
-            \'use strict\'; \
-            function f() {\
-                var o = {}; \
-                with (o) {};\
-            }\
-          }\
-        ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement in strict mode throws SyntaxError (nested function
+    where container is strict)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    // wrapping it in eval since this needs to be a syntax error. The
+    // exception thrown must be a SyntaxError exception.
+    eval("\
+          function foo() {\
+            \'use strict\'; \
+            function f() {\
+                var o = {}; \
+                with (o) {};\
+            }\
+          }\
+        ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-3-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-3-s.js
index 8b0d2961b..e0788cded 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-3-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-3-s.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-3-s.js
- * @description with statement in strict mode throws SyntaxError (nested strict function)
- * @onlyStrict
- */
-
-
-function testcase() {
-  try {
-    // wrapping it in eval since this needs to be a syntax error. The
-    // exception thrown must be a SyntaxError exception.
-    eval("\
-            function foo() {\
-                function f() {\
-                  \'use strict\'; \
-                  var o = {}; \
-                  with (o) {};\
-                }\
-              }\
-        ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement in strict mode throws SyntaxError (nested strict
+    function)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    // wrapping it in eval since this needs to be a syntax error. The
+    // exception thrown must be a SyntaxError exception.
+    eval("\
+            function foo() {\
+                function f() {\
+                  \'use strict\'; \
+                  var o = {}; \
+                  with (o) {};\
+                }\
+              }\
+        ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-4-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-4-s.js
index adb09673b..2c520f37e 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-4-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-4-s.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-4-s.js
- * @description with statement in strict mode throws SyntaxError (strict Function)
- * @onlyStrict
- */
-
-
-function testcase() {
-  try {
-    var f = Function("\
-                      \'use strict\';  \
-                      var o = {}; \
-                      with (o) {};\
-                    ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-	
-  }
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with statement in strict mode throws SyntaxError (strict Function)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    var f = Function("\
+                      \'use strict\';  \
+                      var o = {}; \
+                      with (o) {};\
+                    ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+	
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-5-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-5-s.js
index 3a1ea1ad8..e67ad88f3 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-5-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-5-s.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-5-s.js
- * @description with statement allowed in nested Function even if its container Function is strict)
- * @onlyStrict
- */
-
-
-function testcase() {
-  
-    Function("\'use strict\'; var f1 = Function( \"var o = {}; with (o) {};\")");
-    return true;
-  
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement allowed in nested Function even if its container
+    Function is strict)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+    Function("\'use strict\'; var f1 = Function( \"var o = {}; with (o) {};\")");
+    return true;
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-7-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-7-s.js
index 0ceb2097e..9fe0076bb 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-7-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-7-s.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-7-s.js
- * @description with statement in strict mode throws SyntaxError (function expression, where the container function is directly evaled from strict code)
- * @onlyStrict
- */
-
-
-function testcase() {
-  'use strict';
-
-  try {
-    eval("var f = function () {\
-                var o = {}; \
-                with (o) {}; \
-             }\
-        ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement in strict mode throws SyntaxError (function
+    expression, where the container function is directly evaled from
+    strict code)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval("var f = function () {\
+                var o = {}; \
+                with (o) {}; \
+             }\
+        ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-8-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-8-s.js
index 55cfa8e4e..4c9685a89 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-8-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-8-s.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-8-s.js
- * @description with statement in strict mode throws SyntaxError (function expression, where the container Function is strict)
- * @onlyStrict
- */
-
-
-function testcase() {
-  try {
-    Function("\
-              \'use strict\'; \
-              var f1 = function () {\
-                  var o = {}; \
-                  with (o) {}; \
-                }\
-            ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement in strict mode throws SyntaxError (function
+    expression, where the container Function is strict)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    Function("\
+              \'use strict\'; \
+              var f1 = function () {\
+                  var o = {}; \
+                  with (o) {}; \
+                }\
+            ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-9-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-9-s.js
index b0e29e256..2ed45bd8c 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-9-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-9-s.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch12/12.10/12.10.1/12.10.1-9-s.js
- * @description with statement in strict mode throws SyntaxError (strict function expression)
- * @onlyStrict
- */
-
-
-function testcase() {
-  try {
-    eval("\
-          var f = function () {\
-                \'use strict\';\
-                var o = {}; \
-                with (o) {}; \
-              }\
-        ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError) ;
-  }
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement in strict mode throws SyntaxError (strict function
+    expression)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    eval("\
+          var f = function () {\
+                \'use strict\';\
+                var o = {}; \
+                with (o) {}; \
+              }\
+        ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError) ;
+  }
+ }
+runTestCase(testcase);