Bug 1514288 - save profile run output to log files rather than stdout; r=chmanchester
authorMike Shal <mshal@mozilla.com>
Thu, 03 Jan 2019 18:18:02 +0000
changeset 509530 db9b64fdb7d1dc9263fae2b675da2a31ccd359a5
parent 509529 f5faf952c6d24e59b821018887e355f9af526bf0
child 509531 b83cac4f938ac130e9d8dbd9887f7051d1ddcb63
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1514288
milestone66.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 1514288 - save profile run output to log files rather than stdout; r=chmanchester The output from running the browser during PGO builds can have innocuous error messages in them, but show up in treeherder as potential messages to include when filing bugs. We can just save the output from these runs as files and upload them as artifacts instead, so they don't show up in the build log but are available for inspection if necessary. MozReview-Commit-ID: 3VdVCKVkZNI Differential Revision: https://phabricator.services.mozilla.com/D15154
build/pgo/profileserver.py
toolkit/mozapps/installer/upload-files.mk
--- a/build/pgo/profileserver.py
+++ b/build/pgo/profileserver.py
@@ -93,17 +93,18 @@ if __name__ == '__main__':
 
         # Add MOZ_OBJDIR to the env so that cygprofile.cpp can use it.
         env["MOZ_OBJDIR"] = build.topobjdir
 
         # Run Firefox a first time to initialize its profile
         runner = FirefoxRunner(profile=profile,
                                binary=binary,
                                cmdargs=['data:text/html,<script>Quitter.quit()</script>'],
-                               env=env)
+                               env=env,
+                               process_args={'logfile': 'profile-run-1.log'})
         runner.start()
         ret = runner.wait()
         if ret:
             print("Firefox exited with code %d during profile initialization"
                   % ret)
             httpd.stop()
             sys.exit(ret)
 
@@ -111,15 +112,16 @@ if __name__ == '__main__':
         if jarlog:
             env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog)
             print("jarlog: %s" % env["MOZ_JAR_LOG_FILE"])
 
         cmdargs = ["http://localhost:%d/index.html" % PORT]
         runner = FirefoxRunner(profile=profile,
                                binary=binary,
                                cmdargs=cmdargs,
-                               env=env)
+                               env=env,
+                               process_args={'logfile': 'profile-run-2.log'})
         runner.start(debug_args=debug_args, interactive=interactive)
         ret = runner.wait()
         httpd.stop()
         if ret:
             print("Firefox exited with code %d during profiling" % ret)
             sys.exit(ret)
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -400,16 +400,18 @@ UPLOAD_FILES= \
   $(call QUOTED_WILDCARD,$(MOZ_BUILDID_INFO_TXT_FILE)) \
   $(call QUOTED_WILDCARD,$(MOZ_MOZINFO_FILE)) \
   $(call QUOTED_WILDCARD,$(MOZ_TEST_PACKAGES_FILE)) \
   $(call QUOTED_WILDCARD,$(PKG_JSSHELL)) \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip) \
   $(call QUOTED_WILDCARD,$(topobjdir)/$(MOZ_BUILD_APP)/installer/windows/instgen/setup.exe) \
   $(call QUOTED_WILDCARD,$(topobjdir)/$(MOZ_BUILD_APP)/installer/windows/instgen/setup-stub.exe) \
   $(call QUOTED_WILDCARD,$(topsrcdir)/toolchains.json) \
+  $(call QUOTED_WILDCARD,$(topobjdir)/profile-run-1.log) \
+  $(call QUOTED_WILDCARD,$(topobjdir)/profile-run-2.log) \
   $(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f))))
 
 ifneq ($(filter-out en-US x-test,$(AB_CD)),)
   UPLOAD_FILES += \
     $(call QUOTED_WILDCARD,$(topobjdir)/$(MOZ_BUILD_APP)/installer/windows/l10ngen/setup.exe) \
     $(call QUOTED_WILDCARD,$(topobjdir)/$(MOZ_BUILD_APP)/installer/windows/l10ngen/setup-stub.exe)
 endif