Bug 1325801 - Fix intermittent failure staging cppunittests. r=mshal
☠☠ backed out by fa441ec96615 ☠ ☠
authorChris Manchester <cmanchester@mozilla.com>
Wed, 04 Jan 2017 12:56:14 -0800
changeset 327948 e0378b0c798ee91a3dad9af4b7359a706f26ee22
parent 327947 1bf65dbb4d71ccc02ad63b95a039112073d83e5e
child 327949 9fa895b4c14fc4994b1e36a86932f411d06289f1
push id35633
push usercmanchester@mozilla.com
push dateWed, 04 Jan 2017 21:02:33 +0000
treeherderautoland@e0378b0c798e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1325801
milestone53.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 1325801 - Fix intermittent failure staging cppunittests. r=mshal Dumping symbols can interfere with staging cppunittests in case calling objcopy from the symbol dumping script coincides exactly with calling objcopy when staging cppunittests when the two are run in parallel. This makes dumping symbols depend on staging cppunittests. MozReview-Commit-ID: Hgi1zyIZE7K
testing/testsuite-targets.mk
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -272,16 +272,19 @@ stage-jetpack: make-stage-dir
 	$(MAKE) -C $(DEPTH)/addon-sdk stage-tests-package
 
 CPP_UNIT_TEST_BINS=$(wildcard $(DIST)/cppunittests/*)
 
 ifdef OBJCOPY
 ifneq ($(OBJCOPY), :) # see build/autoconf/toolchain.m4:102 for why this is necessary
 ifndef PKG_SKIP_STRIP
 STRIP_CPP_TESTS := 1
+# Dumping symbols will modify our test programs, so make sure we don't try to
+# strip them as this is happening.
+generatesymbols: stage-cppunittests
 endif
 endif
 endif
 
 stage-cppunittests: make-stage-dir
 	$(NSINSTALL) -D $(PKG_STAGE)/cppunittest
 ifdef STRIP_CPP_TESTS
 	$(foreach bin,$(CPP_UNIT_TEST_BINS),$(OBJCOPY) $(or $(STRIP_FLAGS),--strip-unneeded) $(bin) $(bin:$(DIST)/cppunittests/%=$(PKG_STAGE)/cppunittest/%);)