Bug 1333135 - Install test programs from xpcom/tests with moz.build rather than Makefile.in. r=mshal

MozReview-Commit-ID: AeJHDn2znAk

--HG--
extra : rebase_source : 59ce9a95b047db97e4ab42b7f75587fbb0a6c4c9

xpcom/tests/Makefile.in

@@ -4,10 +4,3 @@
 
 # Make sure we have symbols in case we need to debug these.
 MOZ_DEBUG_SYMBOLS = 1
-
-include $(topsrcdir)/config/rules.mk
-
-ifneq (,$(SIMPLE_PROGRAMS))
-libs::
-	$(INSTALL) $(SIMPLE_PROGRAMS) $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit
-endif

xpcom/tests/moz.build

@@ -15,13 +15,14 @@ EXPORTS.testing += [
     'TestHarness.h',
 ]
 
-SimplePrograms([
+test_progs = [
     'TestArguments',
     'TestBlockingProcess',
     'TestPRIntN',
     'TestQuickReturn',
     'TestUnicodeArguments',
-])
+]
+SimplePrograms(test_progs)
 
 USE_LIBS += ['mfbt']
 
@@ -31,6 +32,9 @@ if CONFIG['COMPILE_ENVIRONMENT']:
     TEST_HARNESS_FILES.xpcshell.xpcom.tests.unit += [
         '!/dist/bin/components/xpcomtest.xpt',
     ]
+    TEST_HARNESS_FILES.xpcshell.xpcom.tests.unit += [
+        '!%s%s' % (f, CONFIG['BIN_SUFFIX']) for f in test_progs
+    ]
 
 XPIDL_MODULE = 'xpcomtest'
 XPIDL_SOURCES += [