Bug 1336525 - Install test support binary in uriloader/exthandler/tests with moz.build, not Makefile.in r=mshal
authorChris Manchester <cmanchester@mozilla.com>
Fri, 03 Feb 2017 12:18:16 -0800
changeset 341087 0747650a1901c10c412d6cd17c550b4d3f40e010
parent 341086 0d6d693fdcb6b1effad9210901f90a6cc8fc4311
child 341088 b02d4bac89282c0b0913470fa3ef40021fad75f2
push id86634
push usercbook@mozilla.com
push dateTue, 07 Feb 2017 13:14:58 +0000
treeherdermozilla-inbound@9dbd2d9b334e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1336525
milestone54.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1336525 - Install test support binary in uriloader/exthandler/tests with moz.build, not Makefile.in r=mshal MozReview-Commit-ID: CLk2YdGJG6a
uriloader/exthandler/tests/Makefile.in
uriloader/exthandler/tests/moz.build
deleted file mode 100644
--- a/uriloader/exthandler/tests/Makefile.in
+++ /dev/null
@@ -1,11 +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/.
-
-include $(topsrcdir)/config/rules.mk
-
-# need the executable for running the xpcshell unit tests
-ifneq (,$(SIMPLE_PROGRAMS))
-libs::
-	$(INSTALL) $(SIMPLE_PROGRAMS) $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit
-endif
--- a/uriloader/exthandler/tests/moz.build
+++ b/uriloader/exthandler/tests/moz.build
@@ -14,11 +14,16 @@ BROWSER_CHROME_MANIFESTS += ['mochitest/
 # test cases with the string "content_encoding" in their names.
 if not CONFIG['MOZ_JSDOWNLOADS']:
     XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
 
 GeckoSimplePrograms([
     'WriteArgument',
 ], linkage=None)
 
+if CONFIG['COMPILE_ENVIRONMENT']:
+    TEST_HARNESS_FILES.xpcshell.uriloader.exthandler.tests.unit += [
+        '!WriteArgument%s' % CONFIG['BIN_SUFFIX']
+    ]
+
 USE_LIBS += [
     'nspr',
 ]