Bug 1322983 - Unconditionally build the minidump-analyzer but run it only on nightly/aurora. r=ted, a=jcristau
authorGabriele Svelto <gsvelto@mozilla.com>
Tue, 13 Dec 2016 15:35:16 +0100
changeset 353717 84c4cc76070fa0a5e6b4abebb07dd666df0a6157
parent 353716 ccec56819e76733f28ae7f046e4602824ddbed10
child 353718 bb61bdb559de94ca42d86b4d619dc038a15e4661
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, jcristau
bugs1322983
milestone52.0a2
Bug 1322983 - Unconditionally build the minidump-analyzer but run it only on nightly/aurora. r=ted, a=jcristau
toolkit/crashreporter/client/crashreporter.cpp
toolkit/crashreporter/moz.build
--- a/toolkit/crashreporter/client/crashreporter.cpp
+++ b/toolkit/crashreporter/client/crashreporter.cpp
@@ -508,27 +508,31 @@ void RewriteStrings(StringTable& queryPa
 
 bool CheckEndOfLifed(string version)
 {
   string reportPath =
     gSettingsPath + UI_DIR_SEPARATOR + "EndOfLife" + version;
   return UIFileExists(reportPath);
 }
 
+#ifndef RELEASE_OR_BETA
+
 static string
 GetMinidumpAnalyzerPath()
 {
   string path = gArgv[0];
   size_t pos = path.rfind(UI_CRASH_REPORTER_FILENAME BIN_SUFFIX);
   path.erase(pos);
   path.append(UI_MINIDUMP_ANALYZER_FILENAME BIN_SUFFIX);
 
   return path;
 }
 
+#endif
+
 int main(int argc, char** argv)
 {
   gArgc = argc;
   gArgv = argv;
 
   if (!ReadConfig()) {
     UIError("Couldn't read configuration.");
     return 0;
@@ -540,18 +544,21 @@ int main(int argc, char** argv)
   if (argc > 1) {
     gReporterDumpFile = argv[1];
   }
 
   if (gReporterDumpFile.empty()) {
     // no dump file specified, run the default UI
     UIShowDefaultUI();
   } else {
-    // start by running minidump analyzer
+#ifndef RELEASE_OR_BETA
+    // start by running minidump analyzer, this is currently enabled only in
+    // nightly and aurora
     UIRunMinidumpAnalyzer(GetMinidumpAnalyzerPath(), gReporterDumpFile);
+#endif
 
     // go ahead with the crash reporter
     gExtraFile = GetAdditionalFilename(gReporterDumpFile, kExtraDataExtension);
     if (gExtraFile.empty()) {
       UIError(gStrings[ST_ERROR_BADARGUMENTS]);
       return 0;
     }
 
--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -46,24 +46,20 @@ elif CONFIG['OS_ARCH'] == 'SunOS':
         'google-breakpad/src/common/solaris',
         'google-breakpad/src/client',
         'google-breakpad/src/client/solaris/handler',
         'google-breakpad/src/tools/solaris/dump_syms',
     ]
 
 DIRS += [
     'client',
+    'jsoncpp/src/lib_json',
+    'minidump-analyzer',
 ]
 
-if CONFIG['NIGHTLY_BUILD']:
-    DIRS += [
-        'jsoncpp/src/lib_json',
-        'minidump-analyzer',
-    ]
-
 if CONFIG['MOZ_CRASHREPORTER_INJECTOR']:
     DIRS += ['injector']
     UNIFIED_SOURCES += [
         'InjectCrashReporter.cpp',
         'LoadLibraryRemote.cpp',
     ]
 
 TEST_DIRS += ['test']