Backed out changeset 10bb1ad646cd (bug 1321065) for ASan gtest failures
authorPhil Ringnalda <philringnalda@gmail.com>
Tue, 29 Nov 2016 20:50:19 -0800
changeset 372051 f6cc35920bf232c5aa2a91606247271214eb6ec8
parent 372050 f9278a331057d291c6163d80d352fa2f3bdd0976
child 372052 8f1e420699832d42753c6503aa31861be6f5b186
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1321065
milestone53.0a1
backs out10bb1ad646cda3d9af40d29faf39b3f88124fd96
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 changeset 10bb1ad646cd (bug 1321065) for ASan gtest failures CLOSED TREE
js/moz.configure
python/mozbuild/mozbuild/test/configure/test_moz_configure.py
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -136,21 +136,17 @@ js_option('--enable-callgrind', env='MOZ
 @depends('--enable-callgrind')
 def callgrind(value):
     if value:
         return True
 
 set_define('MOZ_CALLGRIND', callgrind)
 imply_option('--enable-profiling', callgrind)
 
-@depends(milestone, '--help')
-def enable_profiling(milestone, help):
-    return milestone.is_nightly
-
-js_option('--enable-profiling', env='MOZ_PROFILING', default=enable_profiling,
+js_option('--enable-profiling', env='MOZ_PROFILING',
           help='Set compile flags necessary for using sampling profilers '
                '(e.g. shark, perf)')
 
 @depends('--enable-profiling')
 def profiling(value):
     if value:
         return True
 
--- a/python/mozbuild/mozbuild/test/configure/test_moz_configure.py
+++ b/python/mozbuild/mozbuild/test/configure/test_moz_configure.py
@@ -26,25 +26,25 @@ class TestMozConfigure(BaseConfigureTest
             result = sandbox._value_for(sandbox['all_configure_options'])
             shell = mozpath.abspath('/bin/sh')
             return result.replace('CONFIG_SHELL=%s ' % shell, '')
 
         self.assertEquals('--enable-application=browser',
                           get_value_for(['--enable-application=browser']))
 
         self.assertEquals('--enable-application=browser '
-                          'MOZ_VTUNE=1',
+                          'MOZ_PROFILING=1',
                           get_value_for(['--enable-application=browser',
-                                         'MOZ_VTUNE=1']))
+                                         'MOZ_PROFILING=1']))
 
         value = get_value_for(
-            environ={'MOZ_VTUNE': '1'},
+            environ={'MOZ_PROFILING': '1'},
             mozconfig='ac_add_options --enable-project=js')
 
-        self.assertEquals('--enable-project=js MOZ_VTUNE=1',
+        self.assertEquals('--enable-project=js MOZ_PROFILING=1',
                           value)
 
         # --disable-js-shell is the default, so it's filtered out.
         self.assertEquals('--enable-application=browser',
                           get_value_for(['--enable-application=browser',
                                          '--disable-js-shell']))
 
         # Normally, --without-foo would be filtered out because that's the