Bug 1551262 - Remove mach support for jimdb; r=snorp
authorGeoff Brown <gbrown@mozilla.com>
Mon, 13 May 2019 20:52:29 +0000
changeset 473667 b231eb222b8c8b9eab3014459ff4cf48b6f1d24b
parent 473666 e7e7717d923630782861c01221c5fc5048b04c37
child 473668 2b0045289ea3ff901ce697c2bb51389bca055074
push id36009
push userapavel@mozilla.com
push dateTue, 14 May 2019 04:07:34 +0000
treeherdermozilla-central@96563508f9fe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs1551262
milestone68.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 1551262 - Remove mach support for jimdb; r=snorp If there is still value to this -- if you know of anyone using jimdb via mach, etc -- I am happy to throw this away, but otherwise, would like to clean it up. Differential Revision: https://phabricator.services.mozilla.com/D30943
testing/config/tooltool-manifests/linux32/jimdb-arm-pie.manifest
testing/config/tooltool-manifests/linux32/jimdb-arm.manifest
testing/config/tooltool-manifests/linux32/jimdb-x86-pie.manifest
testing/config/tooltool-manifests/linux32/jimdb-x86.manifest
testing/config/tooltool-manifests/linux64/jimdb-arm-pie.manifest
testing/config/tooltool-manifests/linux64/jimdb-arm.manifest
testing/config/tooltool-manifests/linux64/jimdb-x86-pie.manifest
testing/config/tooltool-manifests/linux64/jimdb-x86.manifest
testing/config/tooltool-manifests/macosx64/jimdb-arm-pie.manifest
testing/config/tooltool-manifests/macosx64/jimdb-arm.manifest
testing/config/tooltool-manifests/macosx64/jimdb-x86-pie.manifest
testing/config/tooltool-manifests/macosx64/jimdb-x86.manifest
testing/mozbase/mozrunner/mozrunner/devices/android_device.py
deleted file mode 100644
--- a/testing/config/tooltool-manifests/linux32/jimdb-arm-pie.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 1961068,
-    "visibility": "public",
-    "digest": "84ae9acfff4428d6ec167f1378d34972eb836d39b7aeeb94f5fd490eb6ca75043902cecd5e85ffd1d2de99313a7e0f80889897cbd1d52fa8b939d6dfb17167c8",
-    "algorithm": "sha512",
-    "filename": "jimdb-arm-pie-linux_x86.tar.bz2",
-    "unpack": true
-  }
-]
deleted file mode 100644
--- a/testing/config/tooltool-manifests/linux32/jimdb-arm.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 1947653,
-    "visibility": "public",
-    "digest": "37810f1f10a2535f1d609ab3fe6b029e14465361c1daa664a9511f46dd56e10aad881a69aa9b69ccb1e483add5030086610bec3f5b7f9409152a0abdf0a98f36",
-    "algorithm": "sha512",
-    "filename": "jimdb-arm-linux_x86.tar.bz2",
-    "unpack": true
-  }
-]
deleted file mode 100644
--- a/testing/config/tooltool-manifests/linux32/jimdb-x86-pie.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 2178685,
-    "visibility": "public",
-    "digest": "3cc22e0fd0c97ed5f7c834665ed9f2692c423767ce5013b753fdeccd174c611e89371bf9fc191dce1ab2089999a66222e0e7b092b52ab742434b9ae2fdd5ec68",
-    "algorithm": "sha512",
-    "filename": "jimdb-x86-pie-linux_x86.tar.bz2",
-    "unpack": true
-  }
-]
deleted file mode 100644
--- a/testing/config/tooltool-manifests/linux32/jimdb-x86.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 2021932,
-    "visibility": "public",
-    "digest": "022e9a0585e9df44e28e8c9f2ce7a46fc07df8e137f5b0badd7b6b59f2d886b91813efdaf1d7d2dd4764b07a9ebc97f94456f1f6b17eabc5dd2c12b1c1c7c11c",
-    "algorithm": "sha512",
-    "filename": "jimdb-x86-linux_x86.tar.bz2",
-    "unpack": true
-  }
-]
deleted file mode 100644
--- a/testing/config/tooltool-manifests/linux64/jimdb-arm-pie.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 2020690,
-    "visibility": "public",
-    "digest": "a057e96cc087d6108ae6b5cfa9829101628172bb58807257301224f552158f72a87bcfa85eb09991b5e7487a8154690a352bae63f599b8a4f3f02f346961fe8e",
-    "algorithm": "sha512",
-    "filename": "jimdb-arm-pie-linux_x64.tar.bz2",
-    "unpack": true
-  }
-]
deleted file mode 100644
--- a/testing/config/tooltool-manifests/linux64/jimdb-arm.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 2008279,
-    "visibility": "public",
-    "digest": "929cb2192b0fdfeecd3d1cf210c10bfe54cf5a617420751a69815d390a0a646cb7240d1326c80fc6bee5d913f851a398a64ecb7a604c06f02799d62cd8117e3b",
-    "algorithm": "sha512",
-    "filename": "jimdb-arm-linux_x64.tar.bz2",
-    "unpack": true
-  }
-]
deleted file mode 100644
--- a/testing/config/tooltool-manifests/linux64/jimdb-x86-pie.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 2263182,
-    "visibility": "public",
-    "digest": "24711d54143978caa77c5db54fc7da142c82c827a9bbbfad0a133ed30440e9a46b7e7fcd9ade886dbc5f0d7cd11a4facb3aeb573303becf6169234edef6f84e9",
-    "algorithm": "sha512",
-    "filename": "jimdb-x86-pie-linux_x64.tar.bz2",
-    "unpack": true
-  }
-]
deleted file mode 100644
--- a/testing/config/tooltool-manifests/linux64/jimdb-x86.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 2097036,
-    "visibility": "public",
-    "digest": "46064b4e0526d7bc78bb5d0ca1595738013663e43d8673f4b868ec1a549a8012f2759cbed9e0e15a11b38a3dea4ea7292a58b05a5b919cf64894760dd27e50a2",
-    "algorithm": "sha512",
-    "filename": "jimdb-x86-linux_x64.tar.bz2",
-    "unpack": true
-  }
-]
deleted file mode 100644
--- a/testing/config/tooltool-manifests/macosx64/jimdb-arm-pie.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 1878317,
-    "visibility": "public",
-    "digest": "bb15c6060582701dd1f10b2a82e38185f30dc072299e54829965d57c7772f002cd45dafe3889a63412d2b72fb56e4a07280a8b9a4d00c756eaf059da74bfe18f",
-    "algorithm": "sha512",
-    "filename": "jimdb-arm-pie-mac_x64.tar.bz2",
-    "unpack": true
-  }
-]
deleted file mode 100644
--- a/testing/config/tooltool-manifests/macosx64/jimdb-arm.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 1870546,
-    "visibility": "public",
-    "digest": "57082b39169e23746db762b10e3a606d86511096724783b3ae747c4570cf469ab7e6d7ae636c3454113c1d68c3b6554a93217908ce141e76f877d84011f0098a",
-    "algorithm": "sha512",
-    "filename": "jimdb-arm-mac_x64.tar.bz2",
-    "unpack": true
-  }
-]
deleted file mode 100644
--- a/testing/config/tooltool-manifests/macosx64/jimdb-x86-pie.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 2105007,
-    "visibility": "public",
-    "digest": "e1d86b076f686dcd9dada92a0d0c9a8fca9ac2311017b214713d9f314fa65123a97e997c5c8fdf90c1579cd7be66b2069314c7e193c80081855af531b804c3c0",
-    "algorithm": "sha512",
-    "filename": "jimdb-x86-pie-mac_x64.tar.bz2",
-    "unpack": true
-  }
-]
deleted file mode 100644
--- a/testing/config/tooltool-manifests/macosx64/jimdb-x86.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 1958623,
-    "visibility": "public",
-    "digest": "0f2d4837eb25412800438dbe87a87f6ef38d4d92379f987e5f1e524ff9ec0c783386789f6a0e15b99e6a443326170cca1bf71e80d016971af3e1371e5b1e9d2d",
-    "algorithm": "sha512",
-    "filename": "jimdb-x86-mac_x64.tar.bz2",
-    "unpack": true
-  }
-]
--- a/testing/mozbase/mozrunner/mozrunner/devices/android_device.py
+++ b/testing/mozbase/mozrunner/mozrunner/devices/android_device.py
@@ -318,66 +318,17 @@ def verify_android_device(build_obj, ins
                     _log_debug(response)
             except Exception as e:
                 _log_warning("unable to verify network connection to device: %s" % str(e))
                 _log_warning("tests may fail without network connectivity to the device!")
         else:
             _log_debug("network check skipped on emulator")
 
     if debugger:
-        # Optionally set up JimDB. See https://wiki.mozilla.org/Mobile/Fennec/Android/GDB.
-        build_platform = _get_device_platform(build_obj.substs)
-        jimdb_path = os.path.join(EMULATOR_HOME_DIR, 'jimdb-%s' % build_platform)
-        jimdb_utils_path = os.path.join(jimdb_path, 'utils')
-        gdb_path = os.path.join(jimdb_path, 'bin', 'gdb')
-        err = None
-        if not os.path.isdir(jimdb_path):
-            err = '%s does not exist' % jimdb_path
-        elif not os.path.isfile(gdb_path):
-            err = '%s not found' % gdb_path
-        if err:
-            _log_info("JimDB (%s) not found: %s" % (build_platform, err))
-            response = raw_input(
-                "Download and setup JimDB (%s)? (Y/n) " % build_platform).strip()
-            if response.lower().startswith('y') or response == '':
-                host_platform = _get_host_platform()
-                if host_platform:
-                    _log_info(
-                        "Installing JimDB (%s/%s). This may take a while..." % (host_platform,
-                                                                                build_platform))
-                    path = os.path.join(MANIFEST_PATH, host_platform,
-                                        'jimdb-%s.manifest' % build_platform)
-                    _get_tooltool_manifest(build_obj.substs, path,
-                                           EMULATOR_HOME_DIR, 'releng.manifest')
-                    _tooltool_fetch()
-                    if os.path.isfile(gdb_path):
-                        # Get JimDB utilities from git repository
-                        proc = ProcessHandler(['git', 'pull'], cwd=jimdb_utils_path)
-                        proc.run()
-                        git_pull_complete = False
-                        try:
-                            proc.wait()
-                            if proc.proc.returncode == 0:
-                                git_pull_complete = True
-                        except Exception:
-                            if proc.poll() is None:
-                                proc.kill(signal.SIGTERM)
-                        if not git_pull_complete:
-                            _log_warning("Unable to update JimDB utils from git -- "
-                                         "some JimDB features may be unavailable.")
-                    else:
-                        _log_warning("Unable to install JimDB -- unable to fetch from tooltool.")
-                else:
-                    _log_warning("Unable to install JimDB -- your platform is not supported!")
-        if os.path.isfile(gdb_path):
-            # sync gdbinit.local with build settings
-            _update_gdbinit(build_obj.substs, os.path.join(jimdb_utils_path, "gdbinit.local"))
-            # ensure JimDB is in system path, so that mozdebug can find it
-            bin_path = os.path.join(jimdb_path, 'bin')
-            os.environ['PATH'] = "%s:%s" % (bin_path, os.environ['PATH'])
+        _log_warning("JimDB is no longer supported")
 
     return device_verified
 
 
 def get_adb_path(build_obj):
     return _find_sdk_exe(build_obj.substs, 'adb', False)