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 1250961 - Move testing/xpcshell/Makefile.in to moz.build. r=gps

Browse Source 
MozReview-Commit-ID: 8J9RzA0RZ0i
This commit is contained in:
Chris Manchester 2016-02-26 13:20:31 -08:00
parent a7485341ef
commit 77c91e9f64
3 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
python/mozbuild/mozbuild/action/test_archive.py
View File

@ -213,7 +213,11 @@ ARCHIVE_FILES = {
{
'source': buildconfig.topobjdir,
'base': 'dist/bin/components',
'pattern': 'test_necko.xpt',
'patterns': [
'httpd.js',
'httpd.manifest',
'test_necko.xpt',
],
'dest': 'bin/components',
},
{
@ -349,11 +353,39 @@ ARCHIVE_FILES = {
'pattern': '**',
'dest': 'xpcshell/tests',
},
{
'source': buildconfig.topsrcdir,
'base': 'testing/xpcshell',
'patterns': [
'head.js',
'moz-http2/**',
'moz-spdy/**',
'node-http2/**',
'node-spdy/**',
'remotexpcshelltests.py',
'runtestsb2g.py',
'runxpcshelltests.py',
'xpcshellcommandline.py',
],
'dest': 'xpcshell',
},
{
'source': STAGE,
'base': '',
'pattern': 'xpcshell/**',
},
{
'source': buildconfig.topobjdir,
'base': '',
'pattern': 'mozinfo.json',
'dest': 'xpcshell',
},
{
'source': buildconfig.topobjdir,
'base': 'build',
'pattern': 'automation.py',
'dest': 'xpcshell',
},
],
}

5
testing/testsuite-targets.mk
View File

@ -176,7 +176,6 @@ stage-all: \
stage-mach \
stage-extensions \
stage-mochitest \
stage-xpcshell \
stage-jstests \
stage-jetpack \
stage-marionette \
@ -281,9 +280,6 @@ ifeq ($(MOZ_BUILD_APP),mobile/android)
$(NSINSTALL) $(DEPTH)/mobile/android/base/fennec_ids.txt $(PKG_STAGE)/mochitest
endif
stage-xpcshell: make-stage-dir
$(MAKE) -C $(DEPTH)/testing/xpcshell stage-package
stage-jstests: make-stage-dir
$(MAKE) -C $(DEPTH)/js/src/tests stage-package
@ -385,7 +381,6 @@ stage-extensions: make-stage-dir
stage-b2g \
stage-config \
stage-mochitest \
stage-xpcshell \
stage-jstests \
stage-android \
stage-jetpack \

36
testing/xpcshell/Makefile.in
View File

@ -5,41 +5,5 @@
include $(topsrcdir)/config/rules.mk
# Harness files from the srcdir
TEST_HARNESS_FILES := \
runxpcshelltests.py \
remotexpcshelltests.py \
runtestsb2g.py \
xpcshellcommandline.py \
head.js \
node-spdy \
moz-spdy \
node-http2 \
moz-http2 \
$(NULL)
# Extra files needed from $(topsrcdir)/build
EXTRA_BUILD_FILES := \
manifestparser.py \
$(NULL)
# Components / typelibs that don't get packaged with
# the build, but that we need for the test harness.
TEST_HARNESS_COMPONENTS := \
httpd.js \
httpd.manifest \
$(NULL)
# Rules for staging the necessary harness bits for a test package
PKG_STAGE = $(DIST)/test-stage
libs::
cp $(DEPTH)/_tests/xpcshell/xpcshell.ini $(DEPTH)/_tests/xpcshell/all-test-dirs.list
stage-package:
$(NSINSTALL) -D $(PKG_STAGE)/xpcshell/tests
@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
@(cd $(topsrcdir)/build && tar $(TAR_CREATE_FLAGS) - $(EXTRA_BUILD_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
@cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/xpcshell
@cp $(DEPTH)/build/automation.py $(PKG_STAGE)/xpcshell
@(cd $(DIST)/bin/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -)