6 files changed, 48 insertions, 60 deletions
diff --git a/test/suite/ch11/11.1/11.1.1/11.1.1-1gs.js b/test/suite/ch11/11.1/11.1.1/11.1.1-1gs.js
index 0f2b30b5d..f7473928d 100644
--- a/test/suite/ch11/11.1/11.1.1/11.1.1-1gs.js
+++ b/test/suite/ch11/11.1/11.1.1/11.1.1-1gs.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 ch11/11.1/11.1.1/11.1.1-1gs.js
- * @description Strict Mode - 'this' object at the global scope is not undefined
- * @onlyStrict
- */
-
-"use strict";
-if (this===undefined) {
-    throw NotEarlyError;
-}
+// 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 - 'this' object at the global scope is not undefined
+flags: [onlyStrict]
+---*/
+
+"use strict";
+if (this===undefined) {
+    throw NotEarlyError;
+}
diff --git a/test/suite/ch11/11.1/11.1.1/S11.1.1_A1.js b/test/suite/ch11/11.1/11.1.1/S11.1.1_A1.js
index c68c32736..876c46e90 100644
--- a/test/suite/ch11/11.1/11.1.1/S11.1.1_A1.js
+++ b/test/suite/ch11/11.1/11.1.1/S11.1.1_A1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "this" is reserved word
- *
- * @path ch11/11.1/11.1.1/S11.1.1_A1.js
- * @description Checking if execution of "this=1" fails
- * @negative
- */
+/*---
+info: The "this" is reserved word
+description: Checking if execution of "this=1" fails
+flags: [negative]
+---*/
 
 this = 1;
-
diff --git a/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.1.js b/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.1.js
index 4094fa914..64589de5c 100644
--- a/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.1.js
+++ b/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Being in function code, "this" and eval("this"), called as a functions, return the global object
- *
- * @path ch11/11.1/11.1.1/S11.1.1_A3.1.js
- * @description Creating function which returns "this" or eval("this")
- * @noStrict
- */
+/*---
+info: >
+    Being in function code, "this" and eval("this"), called as a functions,
+    return the global object
+description: Creating function which returns "this" or eval("this")
+flags: [noStrict]
+---*/
 
 //CHECK#1
 function MyFunction() {return this}
@@ -20,6 +20,3 @@ function MyFunction() {return eval("this")}
 if (MyFunction() !== this) {
   $ERROR('#2: function MyFunction() {return eval("this")} MyFunction() === this. Actual: ' + (MyFunction()));
 }
-
-
-
diff --git a/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.2.js b/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.2.js
index ca0d5e699..e6863804c 100644
--- a/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.2.js
+++ b/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Being in function code, "this" and eval("this"), called as a constructors, return the object
- *
- * @path ch11/11.1/11.1.1/S11.1.1_A3.2.js
- * @description Create function. It have property, that returned "this"
- * @noStrict
- */
+/*---
+info: >
+    Being in function code, "this" and eval("this"), called as a
+    constructors, return the object
+description: Create function. It have property, that returned "this"
+flags: [noStrict]
+---*/
 
 //CHECK#1
 function MyFunction() {this.THIS = this}
@@ -20,5 +20,3 @@ function MyFunction() {this.THIS = eval("this")}
 if ((new MyFunction()).THIS.toString() !== "[object Object]") {
   $ERROR('#2: function MyFunction() {this.THIS = eval("this")} (new MyFunction()).THIS.toString() !== "[object Object]". Actual: ' + ((new MyFunction()).THIS.toString()));
 }
-
-
diff --git a/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.1.js b/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.1.js
index 38e2adbbd..f79e1b463 100644
--- a/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.1.js
+++ b/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Being in anonymous code, "this" and eval("this"), called as a function, return the global object
- *
- * @path ch11/11.1/11.1.1/S11.1.1_A4.1.js
- * @description Creating function with new Function() constructor
- */
+/*---
+info: >
+    Being in anonymous code, "this" and eval("this"), called as a function,
+    return the global object
+description: Creating function with new Function() constructor
+---*/
 
 //CHECK#1
 var MyFunction = new Function("return this");
@@ -19,6 +19,3 @@ MyFunction = new Function("return eval(\'this\')");
 if (MyFunction() !== this) {
   $ERROR('#2: var MyFunction = new Function("return eval(\'this\')"); MyFunction() === this. Actual: ' + (MyFunction()));
 }
-
-
-
diff --git a/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.2.js b/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.2.js
index cd37d6824..1d8fc7469 100644
--- a/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.2.js
+++ b/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Being in anonymous code, "this" and eval("this"), called as a constructor, return the object
- *
- * @path ch11/11.1/11.1.1/S11.1.1_A4.2.js
- * @description Creating function by using new Function() constructor. It has the property, which returns "this"
- */
+/*---
+info: >
+    Being in anonymous code, "this" and eval("this"), called as a
+    constructor, return the object
+description: >
+    Creating function by using new Function() constructor. It has the
+    property, which returns "this"
+---*/
 
 //CHECK#1
 var MyFunction = new Function("this.THIS = this");
@@ -21,5 +23,3 @@ MyObject = new MyFunction();
 if (MyObject.THIS.toString() !== "[object Object]") {
   $ERROR('#2: var MyFunction = new Function("this.THIS = eval(\'this\')"); var MyObject = new MyFunction(); MyObject.THIS.toString() === "[object Object]". Actual: ' + (MyObject.THIS.toString()));
 }
-
-