Bug 1183077: Modify test to check for new ABI on Windows. r=rstrong
authorStephen A Pohl <spohl.mozilla.bugs@gmail.com>
Mon, 27 Jul 2015 10:17:56 -0400
changeset 254767 c22ad1335d55c58e3ea1311617900dd81fd11160
parent 254766 2a1163cd7736bc2cdff56defaf4f24f3d5b186bb
child 254768 90696b162030bcbe7761a293b561e3f930849cb6
push id16720
push userryanvm@gmail.com
push dateMon, 27 Jul 2015 19:45:38 +0000
treeherderb2g-inbound@13354b414396 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong
bugs1183077
milestone42.0a1
Bug 1183077: Modify test to check for new ABI on Windows. r=rstrong
toolkit/mozapps/update/tests/unit_aus_update/urlConstruction.js
--- a/toolkit/mozapps/update/tests/unit_aus_update/urlConstruction.js
+++ b/toolkit/mozapps/update/tests/unit_aus_update/urlConstruction.js
@@ -107,16 +107,19 @@ function check_test_pt4() {
     // or mactel. This is necessary since nsUpdateService.js will set the ABI to
     // Universal-gcc3 for Mac universal builds.
     let macutils = Cc["@mozilla.org/xpcom/mac-utils;1"].
                    getService(Ci.nsIMacUtils);
 
     if (macutils.isUniversalBinary) {
       abi += "-u-" + macutils.architecturesInBinary;
     }
+  } else if (IS_WIN) {
+    // Windows build should report the CPU architecture that it's running on.
+    abi += "-" + getProcArchitecture();
   }
 
   Assert.equal(getResult(gRequestURL), gAppInfo.OS + "_" + abi,
                "the url param for %BUILD_TARGET%" + MSG_SHOULD_EQUAL);
   run_test_pt5();
 }
 
 // url constructed with %LOCALE%