[mq]: 9.diff
authorBrian R. Bondy <netzen@gmail.com>
Sun, 15 Feb 2015 23:52:23 -0500
changeset 491377 3d4bf163f457806bbba05feeb894b6fda8e8e668
parent 491376 70be51021b3f8ed432f15baa1bab276575823284
child 491378 abc78c84e43b3bbe2091632ac53e4a17643a8780
push id47343
push userbmo:dothayer@mozilla.com
push dateWed, 01 Mar 2017 22:58:58 +0000
milestone38.0a1
[mq]: 9.diff
browser/confvars.sh
toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -16,18 +16,16 @@ if test "$OS_ARCH" = "WINNT"; then
             "$MOZ_UPDATE_CHANNEL" = "aurora" -o \
             "$MOZ_UPDATE_CHANNEL" = "beta" -o \
             "$MOZ_UPDATE_CHANNEL" = "release"; then
       if ! test "$MOZ_DEBUG"; then
         MOZ_STUB_INSTALLER=1
       fi
     fi
   fi
-elif test "$OS_ARCH" = "Linux"; then
-  MOZ_VERIFY_MAR_SIGNATURE=1
 elif test "$OS_ARCH" = "Darwin"; then
   MOZ_VERIFY_MAR_SIGNATURE=1
 fi
 
 # Enable building ./signmar and running libmar signature tests
 MOZ_ENABLE_SIGNMAR=1
 
 MOZ_CHROME_FILE_FORMAT=omni
--- a/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
+++ b/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
@@ -15,19 +15,19 @@ generated-files = head_update.js
 [marSuccessComplete.js]
 [marSuccessPartial.js]
 [marFailurePartial.js]
 [marStageSuccessComplete.js]
 skip-if = toolkit == 'gonk'
 reason = bug 820380
 [marStageSuccessPartial.js]
 [marVersionDowngrade.js]
-run-if = os == 'win' || os == 'mac' || os == 'linux'
+run-if = os == 'win' || os == 'mac'
 [marWrongChannel.js]
-run-if = os == 'win' || os == 'mac' || os == 'linux'
+run-if = os == 'win' || os == 'mac'
 [marStageFailurePartial.js]
 [marCallbackAppSuccessComplete_win.js]
 run-if = os == 'win'
 [marCallbackAppSuccessPartial_win.js]
 run-if = os == 'win'
 [marCallbackAppStageSuccessComplete_win.js]
 run-if = os == 'win'
 [marCallbackAppStageSuccessPartial_win.js]