Bug 1461383 - fix test_build.py for local builds; r=chmanchester,f=mshal
authorNathan Froyd <froydnj@mozilla.com>
Tue, 15 May 2018 10:05:23 -0400
changeset 475108 73dd77918ce5997d13cefc2cae32c7ae4644ce82
parent 475107 d52f0d61dd570ae9414bfad4dd3df88051466fdd
child 475109 0ff4d9445553ad91ff379ee025e397f2015f777e
push id1757
push userffxbld-merge
push dateFri, 24 Aug 2018 17:02:43 +0000
treeherdermozilla-release@736023aebdb1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1461383
milestone62.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 1461383 - fix test_build.py for local builds; r=chmanchester,f=mshal test_build.py fails on local builds with messages like: make[4]: Entering directory '/tmp/tmp65BjCH' make[4]: *** No rule to make target 'buildid.h'. Stop. make[4]: Leaving directory '/tmp/tmp65BjCH' /home/froydnj/src/gecko-dev.git/config/faster/rules.mk:76: recipe for target '/tmp/tmp65BjCH/buildid.h' failed make[3]: *** [/tmp/tmp65BjCH/buildid.h] Error 2 make[3]: *** Waiting for unfinished jobs.... make[4]: Entering directory '/tmp/tmp65BjCH' make[4]: *** No rule to make target 'source-repo.h'. Stop. make[4]: Leaving directory '/tmp/tmp65BjCH' /home/froydnj/src/gecko-dev.git/config/faster/rules.mk:76: recipe for target '/tmp/tmp65BjCH/source-repo.h' failed make[3]: *** [/tmp/tmp65BjCH/source-repo.h] Error 2 make[3]: Leaving directory '/tmp/tmp65BjCH/faster' Makefile:155: recipe for target 'faster' failed The tests pass in automation, however, because automation always defines the rules for buildid.h and source-repo.h in the toplevel Makefile.in. For local builds, however, those rules are not defined to avoid build churn. Let's ensure that the necessary rules are defined during testing as well.
Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,18 +28,18 @@ DIST_GARBAGE = config.cache config.log c
    config/autoconf.mk \
    mozilla-config.h \
    netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
    .mozconfig.mk
 
 ifndef MOZ_PROFILE_USE
 # Automation builds should always have a new buildid, but for the sake of not
 # re-linking libxul on every incremental build we do not enforce this for
-# developer builds.
-ifneq (,$(MOZ_AUTOMATION)$(MOZ_BUILD_DATE))
+# developer builds.  Tests always need a new buildid as well.
+ifneq (,$(MOZ_AUTOMATION)$(MOZ_BUILD_DATE)$(TEST_MOZBUILD))
 buildid.h source-repo.h: FORCE
 endif
 endif
 
 ifdef JS_STANDALONE
 configure_dir = $(topsrcdir)/js/src
 else
 configure_dir = $(topsrcdir)