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

Bug 1333608 - Stop naming the testaddon on OSX for the benefit of universal builds. r=gfritzsche

Browse Source 
We were including toolchain info in the testaddon on OSX so we could separate
xpis for universal builds. With universal builds going away, we can stop doing
this.


MozReview-Commit-ID: 4vqMfKJPGp3

--HG--
extra : rebase_source : 7bd0eee6550adf9af136a21ac22f5b59036e2e34
This commit is contained in:
Chris Manchester 2017-01-26 16:10:09 -08:00
parent fe796ebb0a
commit b8159e6c76
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/plugins/test/testaddon/Makefile.in
View File

@ -6,15 +6,13 @@ include $(topsrcdir)/config/rules.mk
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
plugin_file_names = Test.plugin SecondTest.plugin ThirdTest.plugin npswftest.plugin
addon_file_name = testaddon_$(TARGET_XPCOM_ABI).xpi
else
plugin_file_names = $(DLL_PREFIX)nptest$(DLL_SUFFIX) $(DLL_PREFIX)npsecondtest$(DLL_SUFFIX) $(DLL_PREFIX)npthirdtest$(DLL_SUFFIX) $(DLL_PREFIX)npswftest$(DLL_SUFFIX)
addon_file_name = testaddon.xpi
endif
# This is so hacky. Waiting on bug 988938.
testdir = $(topobjdir)/_tests/xpcshell/dom/plugins/test/unit/
addonpath = $(testdir)/$(addon_file_name)
addonpath = $(testdir)/testaddon.xpi
ifdef COMPILE_ENVIRONMENT
libs::

11
dom/plugins/test/unit/test_plugin_default_state_xpi.js
View File

@ -10,7 +10,6 @@ const XRE_EXTENSIONS_DIR_LIST = "XREExtDL";
const NS_APP_PLUGINS_DIR_LIST = "APluginsDL";
const gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
const gXPCOMABI = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).XPCOMABI;
var gProfileDir = null;
function getAddonRoot(profileDir, id) {
@ -21,14 +20,6 @@ function getAddonRoot(profileDir, id) {
return dir;
}
function getTestaddonFilename() {
let abiPart = "";
if (gIsOSX) {
abiPart = "_" + gXPCOMABI;
}
return "testaddon" + abiPart + ".xpi";
}
function run_test() {
allow_all_plugins();
loadAddonManager();
@ -48,7 +39,7 @@ add_task(function* test_state() {
Services.prefs.setIntPref("plugin.default.state", Ci.nsIPluginTag.STATE_CLICKTOPLAY);
Services.prefs.setIntPref("plugin.defaultXpi.state", Ci.nsIPluginTag.STATE_ENABLED);
let success = yield installAddon(getTestaddonFilename());
let success = yield installAddon("testaddon.xpi");
Assert.ok(success, "Should have installed addon.");
let addonDir = getAddonRoot(gProfileDir, ADDON_ID);