JavaScript Tests - make javascript.options.strict tests insensitive to current setting, bug 428396

js/tests/ecma/LexicalConventions/7.4.3-14-n.js

@@ -68,8 +68,14 @@ var prefValue;
 
 print("This test requires option javascript.options.strict enabled");
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 try
 {

js/tests/ecma/LexicalConventions/7.4.3-4-n.js

@@ -68,8 +68,14 @@ var prefValue;
 
 print("This test requires option javascript.options.strict enabled");
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 try
 {

js/tests/ecma/LexicalConventions/7.4.3-7-n.js

@@ -68,8 +68,14 @@ var prefValue;
 
 print("This test requires option javascript.options.strict enabled");
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 try
 {

js/tests/ecma/LexicalConventions/7.4.3-9-n.js

@@ -72,8 +72,14 @@ EXPECTED = "error";
 
 print("This test requires option javascript.options.strict enabled");
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 try
 {

js/tests/ecma_2/Exceptions/lexical-011.js

@@ -65,8 +65,14 @@ writeHeaderToLog( SECTION + " "+ TITLE);
 
 print("This test requires option javascript.options.strict enabled");
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 var result = "Failed";
 var exception = "No exception thrown";

js/tests/ecma_2/Exceptions/lexical-014.js

@@ -65,8 +65,14 @@ writeHeaderToLog( SECTION + " "+ TITLE);
 
 print("This test requires option javascript.options.strict enabled");
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 var result = "Failed";
 var exception = "No exception thrown";

js/tests/ecma_2/Exceptions/lexical-016.js

@@ -65,8 +65,14 @@ writeHeaderToLog( SECTION + " "+ TITLE);
 
 print("This test requires option javascript.options.strict enabled");
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 var result = "Failed";
 var exception = "No exception thrown";

js/tests/ecma_2/Exceptions/lexical-021.js

@@ -65,8 +65,14 @@ writeHeaderToLog( SECTION + " "+ TITLE);
 
 print("This test requires option javascript.options.strict enabled");
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 var result = "Failed";
 var exception = "No exception thrown";

js/tests/ecma_2/LexicalConventions/keywords-001.js

@@ -54,8 +54,14 @@ startTest();
 
 print("This test requires option javascript.options.strict enabled");
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 var result = "failed";
 

js/tests/ecma_3/Object/8.6.1-01.js

@@ -51,8 +51,14 @@ var actual = '';
 var expect = 's.length is read-only';
 var status = summary + ': Throw if STRICT and WERROR is enabled';
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 try
 {

js/tests/js1_5/Exceptions/regress-315147.js

@@ -45,8 +45,14 @@ var expect = 'ReferenceError';
 printBugNumber(BUGNUMBER);
 printStatus (summary);
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 var o = {};
 

js/tests/js1_5/Regress/regress-306633.js

@@ -45,8 +45,14 @@ var expect = '';
 printBugNumber(BUGNUMBER);
 printStatus (summary);
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 expect = 'SyntaxError';
 

js/tests/js1_5/Regress/regress-317533.js

@@ -47,8 +47,14 @@ printStatus (summary);
  
 var code;
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 try
 {

js/tests/js1_5/Regress/regress-323314-1.js

@@ -45,8 +45,14 @@ var expect = '';
 printBugNumber(BUGNUMBER);
 printStatus (summary);
 
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 var xyzzy;
 

js/tests/js1_5/Regress/regress-352197.js

@@ -45,8 +45,14 @@ var expect = 'TypeError: function f does not always return a value';
 printBugNumber(BUGNUMBER);
 printStatus (summary);
  
-options('strict');
-options('werror');
+if (!options().match(/strict/))
+{
+  options('strict');
+}
+if (!options().match(/werror/))
+{
+  options('werror');
+}
 
 try
 {

js/tests/js1_5/extensions/regress-365869.js

@@ -53,8 +53,14 @@ function test()
   printBugNumber(BUGNUMBER);
   printStatus (summary);
 
-  options('strict');
-  options('werror');
+  if (!options().match(/strict/))
+  {
+    options('strict');
+  }
+  if (!options().match(/werror/))
+  {
+    options('werror');
+  }
 
   try
   {

js/tests/js1_5/extensions/regress-367923.js

@@ -55,8 +55,14 @@ function test()
 
   print('This test will fail in Gecko prior to 1.9');
 
-  options('strict');
-  options('werror');
+  if (!options().match(/strict/))
+  {
+    options('strict');
+  }
+  if (!options().match(/werror/))
+  {
+    options('werror');
+  }
 
   try
   {

js/tests/js1_5/extensions/regress-382509.js

@@ -55,6 +55,15 @@ function test()
   printBugNumber(BUGNUMBER);
   printStatus (summary);
 
+  if (options().match(/strict/))
+  {
+    options('strict');
+  }
+  if (options().match(/werror/))
+  {
+    options('werror');
+  }
+
   global.foo = eval;
   global.a   = 'global';
   expect = 'global indirect';
@@ -76,6 +85,7 @@ function test()
 
   options('strict');
   options('werror');
+
   try
   {
     var foo = eval;

js/tests/js1_7/block/regress-347559.js

@@ -58,8 +58,14 @@ function test()
   actual = 'No Warning';
   expect = 'No Warning';
 
-  options('strict');
-  options('werror');
+  if (!options().match(/strict/))
+  {
+    options('strict');
+  }
+  if (!options().match(/werror/))
+  {
+    options('werror');
+  }
 
   try
   {