From cb519f74fc5c7e1e05729445abf2c910e8dca28d Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Fri, 4 May 2012 08:09:14 -0400
Subject: [PATCH] Bug 751652 - Disable MAR tests when security checks are
 disabled. r=rstrong

---
 toolkit/mozapps/update/test/unit/head_update.js.in         | 7 +++++++
 .../update/test/unit/test_0113_versionDowngradeCheck.js    | 4 ++++
 .../update/test/unit/test_0114_productChannelCheck.js      | 4 ++++
 3 files changed, 15 insertions(+)

diff --git a/toolkit/mozapps/update/test/unit/head_update.js.in b/toolkit/mozapps/update/test/unit/head_update.js.in
index 4be57247fcf1..4ae1e734316c 100644
--- a/toolkit/mozapps/update/test/unit/head_update.js.in
+++ b/toolkit/mozapps/update/test/unit/head_update.js.in
@@ -80,6 +80,13 @@ const IS_ANDROID = true;
 const IS_ANDROID = false;
 #endif
 
+
+#ifdef MOZ_VERIFY_MAR_SIGNATURE
+const IS_MAR_CHECKS_ENABLED = true;
+#else
+const IS_MAR_CHECKS_ENABLED = false;
+#endif
+
 const URL_HOST = "http://localhost:4444/";
 const URL_PATH = "data";
 
diff --git a/toolkit/mozapps/update/test/unit/test_0113_versionDowngradeCheck.js b/toolkit/mozapps/update/test/unit/test_0113_versionDowngradeCheck.js
index a27a51f7b6e5..88c6f09a90ef 100644
--- a/toolkit/mozapps/update/test/unit/test_0113_versionDowngradeCheck.js
+++ b/toolkit/mozapps/update/test/unit/test_0113_versionDowngradeCheck.js
@@ -47,6 +47,10 @@ const TEST_FILES = [];
 const VERSION_DOWNGRADE_ERROR = "23";
 
 function run_test() {
+  if (!IS_MAR_CHECKS_ENABLED) {
+    return;
+  }
+
   // Setup an old version MAR file
   do_register_cleanup(cleanupUpdaterTest);
   setupUpdaterTest(MAR_OLD_VERSION_FILE);
diff --git a/toolkit/mozapps/update/test/unit/test_0114_productChannelCheck.js b/toolkit/mozapps/update/test/unit/test_0114_productChannelCheck.js
index 3d5f71748528..b8c052b385e0 100644
--- a/toolkit/mozapps/update/test/unit/test_0114_productChannelCheck.js
+++ b/toolkit/mozapps/update/test/unit/test_0114_productChannelCheck.js
@@ -47,6 +47,10 @@ const TEST_FILES = [];
 const MAR_CHANNEL_MISMATCH_ERROR = "22";
 
 function run_test() {
+  if (!IS_MAR_CHECKS_ENABLED) {
+    return;
+  }
+
   // Setup a wrong channel MAR file
   do_register_cleanup(cleanupUpdaterTest);
   setupUpdaterTest(MAR_WRONG_CHANNEL_FILE);