JavaScript Test Library - trap exceptions when getting non-existent options in JavaScriptOptions()

js/tests/ecma/shell.js

@@ -778,8 +778,23 @@ function JavaScriptOptions()
       throw 'JavaScriptOptions: unable to get prefService branch';
     }
 
-    this.orig.strict = this.strict = pref.getBoolPref('javascript.options.strict');
-    this.orig.werror = this.werror = pref.getBoolPref('javascript.options.werror');
+    try
+    {
+      this.orig.strict = this.strict = 
+        pref.getBoolPref('javascript.options.strict');
+    }
+    catch(e)
+    {
+    }
+
+    try
+    {
+      this.orig.werror = this.werror = 
+        pref.getBoolPref('javascript.options.werror');
+    }
+    catch(e)
+    {
+    }
   }
 }
 

js/tests/ecma_2/shell.js

@@ -341,8 +341,23 @@ function JavaScriptOptions()
       throw 'JavaScriptOptions: unable to get prefService branch';
     }
 
-    this.orig.strict = this.strict = pref.getBoolPref('javascript.options.strict');
-    this.orig.werror = this.werror = pref.getBoolPref('javascript.options.werror');
+    try
+    {
+      this.orig.strict = this.strict = 
+        pref.getBoolPref('javascript.options.strict');
+    }
+    catch(e)
+    {
+    }
+
+    try
+    {
+      this.orig.werror = this.werror = 
+        pref.getBoolPref('javascript.options.werror');
+    }
+    catch(e)
+    {
+    }
   }
 }
 

js/tests/ecma_3/shell.js

@@ -384,8 +384,23 @@ function JavaScriptOptions()
       throw 'JavaScriptOptions: unable to get prefService branch';
     }
 
-    this.orig.strict = this.strict = pref.getBoolPref('javascript.options.strict');
-    this.orig.werror = this.werror = pref.getBoolPref('javascript.options.werror');
+    try
+    {
+        this.orig.strict = this.strict = 
+            pref.getBoolPref('javascript.options.strict');
+    }
+    catch(e)
+    {
+    }
+
+    try
+    {
+        this.orig.werror = this.werror = 
+            pref.getBoolPref('javascript.options.werror');
+    }
+    catch(e)
+    {
+    }
   }
 }
 

js/tests/js1_1/shell.js

@@ -289,8 +289,23 @@ function JavaScriptOptions()
       throw 'JavaScriptOptions: unable to get prefService branch';
     }
 
-    this.orig.strict = this.strict = pref.getBoolPref('javascript.options.strict');
-    this.orig.werror = this.werror = pref.getBoolPref('javascript.options.werror');
+    try
+    {
+      this.orig.strict = this.strict = 
+        pref.getBoolPref('javascript.options.strict');
+    }
+    catch(e)
+    {
+    }
+
+    try
+    {
+      this.orig.werror = this.werror = 
+        pref.getBoolPref('javascript.options.werror');
+    }
+    catch(e)
+    {
+    }
   }
 }
 

js/tests/js1_2/shell.js

@@ -263,8 +263,23 @@ function JavaScriptOptions()
       throw 'JavaScriptOptions: unable to get prefService branch';
     }
 
-    this.orig.strict = this.strict = pref.getBoolPref('javascript.options.strict');
-    this.orig.werror = this.werror = pref.getBoolPref('javascript.options.werror');
+    try
+    {
+      this.orig.strict = this.strict = 
+        pref.getBoolPref('javascript.options.strict');
+    }
+    catch(e)
+    {
+    }
+
+    try
+    {
+      this.orig.werror = this.werror = 
+        pref.getBoolPref('javascript.options.werror');
+    }
+    catch(e)
+    {
+    }
   }
 }
 

js/tests/js1_3/shell.js

@@ -311,8 +311,23 @@ function JavaScriptOptions()
       throw 'JavaScriptOptions: unable to get prefService branch';
     }
 
-    this.orig.strict = this.strict = pref.getBoolPref('javascript.options.strict');
-    this.orig.werror = this.werror = pref.getBoolPref('javascript.options.werror');
+    try
+    {
+      this.orig.strict = this.strict = 
+        pref.getBoolPref('javascript.options.strict');
+    }
+    catch(e)
+    {
+    }
+
+    try
+    {
+      this.orig.werror = this.werror = 
+        pref.getBoolPref('javascript.options.werror');
+    }
+    catch(e)
+    {
+    }
   }
 }
 

js/tests/js1_4/shell.js

@@ -312,8 +312,23 @@ function JavaScriptOptions()
       throw 'JavaScriptOptions: unable to get prefService branch';
     }
 
-    this.orig.strict = this.strict = pref.getBoolPref('javascript.options.strict');
-    this.orig.werror = this.werror = pref.getBoolPref('javascript.options.werror');
+    try
+    {
+      this.orig.strict = this.strict = 
+        pref.getBoolPref('javascript.options.strict');
+    }
+    catch(e)
+    {
+    }
+
+    try
+    {
+      this.orig.werror = this.werror = 
+        pref.getBoolPref('javascript.options.werror');
+    }
+    catch(e)
+    {
+    }
   }
 }
 

js/tests/js1_5/shell.js

@@ -384,8 +384,23 @@ function JavaScriptOptions()
       throw 'JavaScriptOptions: unable to get prefService branch';
     }
 
-    this.orig.strict = this.strict = pref.getBoolPref('javascript.options.strict');
-    this.orig.werror = this.werror = pref.getBoolPref('javascript.options.werror');
+    try
+    {
+        this.orig.strict = this.strict = 
+            pref.getBoolPref('javascript.options.strict');
+    }
+    catch(e)
+    {
+    }
+
+    try
+    {
+        this.orig.werror = this.werror = 
+            pref.getBoolPref('javascript.options.werror');
+    }
+    catch(e)
+    {
+    }
   }
 }
 

js/tests/js1_6/shell.js

@@ -384,8 +384,23 @@ function JavaScriptOptions()
       throw 'JavaScriptOptions: unable to get prefService branch';
     }
 
-    this.orig.strict = this.strict = pref.getBoolPref('javascript.options.strict');
-    this.orig.werror = this.werror = pref.getBoolPref('javascript.options.werror');
+    try
+    {
+        this.orig.strict = this.strict = 
+            pref.getBoolPref('javascript.options.strict');
+    }
+    catch(e)
+    {
+    }
+
+    try
+    {
+        this.orig.werror = this.werror = 
+            pref.getBoolPref('javascript.options.werror');
+    }
+    catch(e)
+    {
+    }
   }
 }
 

js/tests/lc2/shell.js

@@ -336,8 +336,23 @@ function JavaScriptOptions()
       throw 'JavaScriptOptions: unable to get prefService branch';
     }
 
-    this.orig.strict = this.strict = pref.getBoolPref('javascript.options.strict');
-    this.orig.werror = this.werror = pref.getBoolPref('javascript.options.werror');
+    try
+    {
+      this.orig.strict = this.strict = 
+        pref.getBoolPref('javascript.options.strict');
+    }
+    catch(e)
+    {
+    }
+
+    try
+    {
+      this.orig.werror = this.werror = 
+        pref.getBoolPref('javascript.options.werror');
+    }
+    catch(e)
+    {
+    }
   }
 }
 

js/tests/lc3/shell.js

@@ -348,8 +348,23 @@ function JavaScriptOptions()
       throw 'JavaScriptOptions: unable to get prefService branch';
     }
 
-    this.orig.strict = this.strict = pref.getBoolPref('javascript.options.strict');
-    this.orig.werror = this.werror = pref.getBoolPref('javascript.options.werror');
+    try
+    {
+        this.orig.strict = this.strict = 
+            pref.getBoolPref('javascript.options.strict');
+    }
+    catch (e)
+    {
+    }
+
+    try
+    {
+        this.orig.werror = this.werror = 
+            pref.getBoolPref('javascript.options.werror');
+    }
+    catch(e)
+    {
+    }
   }
 }