From b1b7fa69b47e22c2f6986ecece2012d67740e80f Mon Sep 17 00:00:00 2001
From: Jae-Seong Lee-Russo <lusian@gmail.com>
Date: Fri, 6 Nov 2009 08:34:57 +0100
Subject: [PATCH] Bug 521191 - xpcshell-tests: some unit tests fail with the
 '-S' option ('strict' & 'werror' on). r=smontagu,dtownsend,mano

--HG--
extra : rebase_source : c5e0853fc64557f699d78c67f2907f6b48958563
---
 intl/uconv/tests/unit/test_charset_conversion.js          | 2 ++
 modules/libjar/zipwriter/test/unit/test_zippermissions.js | 2 +-
 toolkit/mozapps/extensions/test/unit/test_bug386153.js    | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/intl/uconv/tests/unit/test_charset_conversion.js b/intl/uconv/tests/unit/test_charset_conversion.js
index b987fcb6f8ef..4f9e8224d8f1 100644
--- a/intl/uconv/tests/unit/test_charset_conversion.js
+++ b/intl/uconv/tests/unit/test_charset_conversion.js
@@ -136,6 +136,7 @@ function test_cross_conversion()
     var ss = StorageStream();
 
     var bos = new BOS(ss.getOutputStream(0));
+    var av;
     while ((av = fin.available()) > 0)
     {
       var data = fin.readByteArray(av);
@@ -199,6 +200,7 @@ function equal(stream, codePoints)
   }
 
   do_throw("not reached");
+  return false;
 }
 
 function equalUnicharStreams(s1, s2)
diff --git a/modules/libjar/zipwriter/test/unit/test_zippermissions.js b/modules/libjar/zipwriter/test/unit/test_zippermissions.js
index 8c38284495b2..2d05914cbb59 100644
--- a/modules/libjar/zipwriter/test/unit/test_zippermissions.js
+++ b/modules/libjar/zipwriter/test/unit/test_zippermissions.js
@@ -91,7 +91,7 @@ function run_test() {
   }
   zipW.close();
 
-  zipR = new ZipReader(tmpFile);
+  var zipR = new ZipReader(tmpFile);
   for (let i = 0; i < TESTS.length; i++) {
     zipR.extract(TESTS[i].name, file);
     dump("Testing file permissions for " + TESTS[i].name + "\n");
diff --git a/toolkit/mozapps/extensions/test/unit/test_bug386153.js b/toolkit/mozapps/extensions/test/unit/test_bug386153.js
index aef395f1454b..773c54e0577d 100644
--- a/toolkit/mozapps/extensions/test/unit/test_bug386153.js
+++ b/toolkit/mozapps/extensions/test/unit/test_bug386153.js
@@ -48,6 +48,7 @@ function findXPI(dpb, name) {
       return i * 4;
   }
   do_throw(name + " wasn't in the list");
+  return 0;
 }
 
 // Called to display the XPInstall dialog