wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1241976 - port INSTALL_TARGETS in xpcom/tests to moz.build; r=glandium

Browse Source
This commit is contained in:
Mike Shal 2016-01-21 21:06:50 -05:00
parent 4274261777
commit 1d0d65215a
9 changed files with 15 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xpcom/tests/bug656331_component/Makefile.in
View File

@ -1,16 +0,0 @@
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# Blatantly copied from xpcom/tests/component.
unittestlocation = xpcom/tests/unit
MANIFEST = bug656331.manifest
MANIFEST_PATH = $(testxpcobjdir)/$(unittestlocation)
PP_TARGETS += MANIFEST
LIB_FILES = $(SHARED_LIBRARY)
LIB_DEST = $(testxpcobjdir)/$(unittestlocation)
INSTALL_TARGETS += LIB

5
xpcom/tests/bug656331_component/moz.build
View File

@ -4,7 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIST_INSTALL = False
FINAL_TARGET = '_tests/xpcshell/xpcom/tests/unit'
EXTRA_PP_COMPONENTS += [
'bug656331.manifest',
]
SOURCES += [
'TestComponent.cpp',

14
xpcom/tests/component/Makefile.in
View File

@ -1,14 +0,0 @@
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
unittestlocation = xpcom/tests/unit
MANIFEST = testcomponent.manifest
MANIFEST_PATH = $(testxpcobjdir)/$(unittestlocation)
PP_TARGETS += MANIFEST
LIB_FILES = $(SHARED_LIBRARY)
LIB_DEST = $(testxpcobjdir)/$(unittestlocation)
INSTALL_TARGETS += LIB

5
xpcom/tests/component/moz.build
View File

@ -4,7 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIST_INSTALL = False
FINAL_TARGET = '_tests/xpcshell/xpcom/tests/unit'
EXTRA_PP_COMPONENTS += [
'testcomponent.manifest',
]
SOURCES += [
'TestComponent.cpp',

10
xpcom/tests/component_no_aslr/Makefile.in
View File

@ -3,16 +3,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
unittestlocation = xpcom/tests/unit
MANIFEST = testcompnoaslr.manifest
MANIFEST_PATH = $(testxpcobjdir)/$(unittestlocation)
PP_TARGETS += MANIFEST
LIB_FILES = $(SHARED_LIBRARY)
LIB_DEST = $(testxpcobjdir)/$(unittestlocation)
INSTALL_TARGETS += LIB
include $(topsrcdir)/config/rules.mk
LDFLAGS := $(filter-out -DYNAMICBASE,$(LDFLAGS)) -DYNAMICBASE:NO

5
xpcom/tests/component_no_aslr/moz.build
View File

@ -4,7 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIST_INSTALL = False
FINAL_TARGET = '_tests/xpcshell/xpcom/tests/unit'
EXTRA_PP_COMPONENTS += [
'testcompnoaslr.manifest',
]
SOURCES += [
'TestComponent.cpp',

2
xpcom/tests/unit/test_bug656331.js
View File

@ -24,7 +24,7 @@ function run_test() {
getService(Ci.nsIConsoleService);
cs.registerListener(kConsoleListener);
let manifest = do_get_file('bug656331.manifest');
let manifest = do_get_file('components/bug656331.manifest');
registerAppManifest(manifest);
do_check_false("{f18fb09b-28b4-4435-bc5b-8027f18df743}" in Components.classesByID);

2
xpcom/tests/unit/test_comp_no_aslr.js
View File

@ -4,7 +4,7 @@ var Cc = Components.classes;
var Ci = Components.interfaces;
function run_test() {
let manifest = do_get_file('testcompnoaslr.manifest');
let manifest = do_get_file('components/testcompnoaslr.manifest');
registerAppManifest(manifest);
var sysInfo = Cc["@mozilla.org/system-info;1"].
getService(Ci.nsIPropertyBag2);

2
xpcom/tests/unit/test_compmgr_warnings.js
View File

@ -57,7 +57,7 @@ function run_test()
var manifest = do_get_file('compmgr_warnings.manifest');
registerAppManifest(manifest);
manifest = do_get_file('testcomponent.manifest');
manifest = do_get_file('components/testcomponent.manifest');
registerAppManifest(manifest);
run_deferred_event(function() {