Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 491464, Append -shark to BUILDTARGET for update queries when shark is enabled, r=rstrong

Browse Source
This commit is contained in:
Nick Thomas 2011-06-30 10:23:04 +12:00
parent a244c5e9ad
commit f98e431d4d
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolkit/mozapps/update/nsUpdateService.js
View File

@ -178,6 +178,10 @@ XPCOMUtils.defineLazyGetter(this, "gABI", function aus_gABI() {
if (macutils.isUniversalBinary)
abi += "-u-" + macutils.architecturesInBinary;
#ifdef MOZ_SHARK
// Disambiguate optimised and shark nightlies
abi += "-shark"
#endif
#endif
return abi;
});

5
toolkit/mozapps/update/test/unit/head_update.js.in
View File

@ -59,6 +59,11 @@ const IS_OS2 = false;
#ifdef XP_MACOSX
const IS_MACOSX = true;
#ifdef MOZ_SHARK
const IS_SHARK = true;
#else
const IS_SHARK = false;
#endif
#else
const IS_MACOSX = false;
#endif

5
toolkit/mozapps/update/test/unit/test_0040_general.js
View File

@ -141,6 +141,11 @@ function check_test_pt4() {
if (macutils.isUniversalBinary)
abi += "-u-" + macutils.architecturesInBinary;
if (IS_SHARK) {
// Disambiguate optimised and shark nightlies
abi += "-shark"
}
}
do_check_eq(getResult(gRequestURL), gAppInfo.OS + "_" + abi);