Backed out changesets be94d55627f4 and dfc1cb1c26d9 (bug 1187664) because they depend on bug 1186748.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 30 Jul 2015 12:07:38 -0400
changeset 287029 a2d31912a7a983e63ea5307eff57828ccc911356
parent 287028 f9ccbf328382d656bcce4ad418ea3a6b9049f763
child 287058 3f22c1f8153608c2b2d84f7a69db02e167533cc0
child 287071 28196d699a7874df7bb61e66c4c87a668664b858
child 287132 c14a0de10f23d4b40a314d20fa471b7c27009f97
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1187664, 1186748
milestone42.0a1
backs outbe94d55627f4e6c57ea34f69556161bd39f001a6
dfc1cb1c26d92739859469392eb794551df40b8e
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
Backed out changesets be94d55627f4 and dfc1cb1c26d9 (bug 1187664) because they depend on bug 1186748.
CLOBBER
build/unix/mozconfig.gtk
build/valgrind/mach_commands.py
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1186748 needed a CLOBBER
+Bug 965151 needed a CLOBBER
--- a/build/unix/mozconfig.gtk
+++ b/build/unix/mozconfig.gtk
@@ -27,24 +27,16 @@ if [ -d "$topsrcdir/gtk3" ]; then
   $topsrcdir/gtk3/usr/local/bin/pango-querymodules > $topsrcdir/gtk3/usr/local/etc/pango/pango.modules
 
   # same with gdb-pixbuf and loaders.cache
   LD_LIBRARY_PATH=$topsrcdir/gtk3/usr/local/lib \
   GDK_PIXBUF_MODULE_FILE=$topsrcdir/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
   GDK_PIXBUF_MODULEDIR=$topsrcdir/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders \
   $topsrcdir/gtk3/usr/local/bin/gdk-pixbuf-query-loaders > $topsrcdir/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 
-  # The fontconfig version in the tooltool package has known uses of
-  # uninitialized memory when creating its cache, and while most users
-  # will already have an existing cache, running Firefox on automation
-  # will create it. Combined with valgrind, this generates irrelevant
-  # errors.
-  # So create the fontconfig cache beforehand.
-  $TOOLTOOL_DIR/gtk3/usr/local/bin/fc-cache
-
   # mock build environment doesn't have fonts in /usr/share/fonts, but
   # has some in /usr/share/X11/fonts. Add this directory to the
   # fontconfig configuration without changing the gtk3 tooltool package.
   cat << EOF > $topsrcdir/gtk3/usr/local/etc/fonts/local.conf
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <dir>/usr/share/X11/fonts</dir>
--- a/build/valgrind/mach_commands.py
+++ b/build/valgrind/mach_commands.py
@@ -106,23 +106,16 @@ class MachCommands(MachCommandBase):
                 '--smc-check=all-non-file',
                 '--vex-iropt-register-updates=allregs-at-mem-access',
                 '--gen-suppressions=all',
                 '--num-callers=36',
                 '--leak-check=full',
                 '--show-possibly-lost=no',
                 '--track-origins=yes',
                 '--trace-children=yes',
-                # The gstreamer plugin scanner can run as part of executing
-                # firefox, but is an external program. In some weird cases,
-                # valgrind finds errors while executing __libc_freeres when
-                # it runs, but those are not relevant, as it's related to
-                # executing third party code. So don't trace
-                # gst-plugin-scanner.
-                '--trace-children-skip=*/gst-plugin-scanner',
                 '-v',  # Enable verbosity to get the list of used suppressions
             ]
 
             for s in suppressions:
                 valgrind_args.append('--suppressions=' + s)
 
             supps_dir = os.path.join(build_dir, 'valgrind')
             supps_file1 = os.path.join(supps_dir, 'cross-architecture.sup')