Bug 983417 - Download minidump_stackwalk for Android 2.3; r=kmoir
authorGeoff Brown <gbrown@mozilla.com>
Tue, 18 Mar 2014 15:06:18 -0600
changeset 2546 01ab4703b0c544e7a8fcd4fdf9ef95b1df6fa314
parent 2545 09ff89dc4a5d1adc83f408a3324d974611ab94b6
child 2547 36f74e4dab7bc394f2a5a5db3ce85b7034cbe1ec
push id1857
push usergbrown@mozilla.com
push dateTue, 18 Mar 2014 21:06:41 +0000
reviewerskmoir
bugs983417
Bug 983417 - Download minidump_stackwalk for Android 2.3; r=kmoir
configs/android/androidarm.py
configs/android/androidx86.py
scripts/android_emulator_unittest.py
--- a/configs/android/androidarm.py
+++ b/configs/android/androidarm.py
@@ -19,17 +19,16 @@ config = {
     "exes": {
         'adb': '/tools/android-sdk18/platform-tools/adb',
         'python': '/tools/buildbot/bin/python',
         'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
     },
     "env": {
         "DISPLAY": ":0.0",
         "PATH": "%(PATH)s:/tools/android-sdk18/tools:/tools/android-sdk18/platform-tools",
-        "MINIDUMP_STACKWALK": "/home/cltbld/talos-slave/test/build/venv/lib/python2.7/site-packages/talos/breakpad/linux64/minidump_stackwalk",
         "MINIDUMP_SAVEPATH": "%(abs_work_dir)s/../minidumps"
     },
     "default_actions": [
         'clobber',
         'read-buildbot-config',
         'download-cacheable-artifacts',
         'setup-avds',
         'start-emulators',
@@ -224,13 +223,14 @@ config = {
             "run_filename": "remotexpcshelltests.py",
             "options": ["--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
                 "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s",
                 "--apk=%(installer_path)s", "--no-logfiles",
                 "--symbols-path=%(symbols_path)s",
             ],
         },
     }, # end of "suite_definitions"
+    "download_minidump_stackwalk": True,
     "default_blob_upload_servers": [
          "https://blobupload.elasticbeanstalk.com",
     ],
     "blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
 }
--- a/configs/android/androidx86.py
+++ b/configs/android/androidx86.py
@@ -18,17 +18,16 @@ config = {
     "exes": {
         'adb': '/tools/android-sdk18/platform-tools/adb',
         'python': '/tools/buildbot/bin/python',
         'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
     },
     "env": {
         "DISPLAY": ":0.0",
         "PATH": "%(PATH)s:/tools/android-sdk18/tools:/tools/android-sdk18/platform-tools",
-        "MINIDUMP_STACKWALK": "/home/cltbld/talos-slave/test/build/venv/lib/python2.7/site-packages/talos/breakpad/linux64/minidump_stackwalk",
     },
     "default_actions": [
         'clobber',
         'read-buildbot-config',
         'download-cacheable-artifacts',
         'setup-avds',
         'start-emulators',
         'download-and-extract',
@@ -158,13 +157,14 @@ config = {
             "run_filename": "remotexpcshelltests.py",
             "options": ["--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
                 "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s",
                 "--apk=%(installer_path)s", "--no-logfiles",
                 "--symbols-path=%(symbols_path)s",
             ],
         },
     }, # end of "suite_definitions"
+    "download_minidump_stackwalk": True,
     "default_blob_upload_servers": [
          "https://blobupload.elasticbeanstalk.com",
     ],
     "blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
 }
--- a/scripts/android_emulator_unittest.py
+++ b/scripts/android_emulator_unittest.py
@@ -427,17 +427,18 @@ class AndroidEmulatorTest(BlobUploadMixi
         dirs = self.query_abs_dirs()
         cmd = self._build_command(self.emulators[emulator_index], suite_name)
         try:
             cwd = dirs['abs_%s_dir' % self.test_suite_definitions[suite_name]["category"]]
         except:
             self.fatal("Don't know how to run --test-suite '%s'!" % suite_name)
 
         env = self.query_env()
-        self.query_minidump_stackwalk()
+        if self.query_minidump_stackwalk():
+            env['MINIDUMP_STACKWALK'] = self.minidump_stackwalk_path
         env['MOZ_UPLOAD_DIR'] = self.query_abs_dirs()['abs_blob_upload_dir']
         env['MINIDUMP_SAVE_PATH'] = self.query_abs_dirs()['abs_blob_upload_dir']
 
         self.info("Running on %s the command %s" % (self.emulators[emulator_index]["name"], subprocess.list2cmdline(cmd)))
         tmp_file = tempfile.NamedTemporaryFile(mode='w')
         tmp_stdout = open(tmp_file.name, 'w')
         self.info("Created temp file %s." % tmp_file.name)
         return {