From b81bccea511d3b6e1c4ce5d15efec4456e4e7437 Mon Sep 17 00:00:00 2001
From: Ben Hearsum <bhearsum@mozilla.com>
Date: Thu, 22 Oct 2020 13:12:32 +0000
Subject: [PATCH] Bug 1638952: remove check-spidermonkey mach command.
 r=sfink,releng-reviewers,aki DONTBUILD

Differential Revision: https://phabricator.services.mozilla.com/D94159
---
 mach                                       |  1 -
 testing/mach_commands.py                   | 25 ----------------------
 testing/mozbase/moztest/moztest/resolve.py |  5 -----
 3 files changed, 31 deletions(-)

diff --git a/mach b/mach
index 964d4a59e1ea..e5bc83ca8db7 100755
--- a/mach
+++ b/mach
@@ -14,7 +14,6 @@
 py2commands="
     android
     awsy-test
-    check-spidermonkey
     crashtest
     firefox-ui-functional
     geckodriver
diff --git a/testing/mach_commands.py b/testing/mach_commands.py
index 4b8b09b6680c..f55f2e7c398d 100644
--- a/testing/mach_commands.py
+++ b/testing/mach_commands.py
@@ -565,31 +565,6 @@ class SpiderMonkeyTests(MachCommandBase):
 
         return subprocess.call(check_cmd)
 
-    @Command('check-spidermonkey', category='testing',
-             description='Run SpiderMonkey tests (JavaScript engine).')
-    @CommandArgument('--valgrind', action='store_true',
-                     help='Run jit-test suite with valgrind flag')
-    def run_checkspidermonkey(self, valgrind=False):
-        print('Running jit-tests')
-        jittest_args = [
-            '--no-slow',
-            '--jitflags=all',
-        ]
-        if valgrind:
-            jittest_args.append('--valgrind')
-        jittest_result = self.run_jittests(shell=None, params=jittest_args)
-
-        print('running jstests')
-        jstest_result = self.run_jstests(shell=None, params=[])
-
-        print('running jsapi-tests')
-        jsapi_tests_result = self.run_jsapitests(test_name=None)
-
-        print('running check-js-msg-encoding')
-        check_js_msg_result = self.run_check_js_msg()
-
-        return jittest_result and jstest_result and jsapi_tests_result and check_js_msg_result
-
 
 def get_jsshell_parser():
     from jsshell.benchmark import get_parser
diff --git a/testing/mozbase/moztest/moztest/resolve.py b/testing/mozbase/moztest/moztest/resolve.py
index dcd56855ed05..830d580b6e9b 100644
--- a/testing/mozbase/moztest/moztest/resolve.py
+++ b/testing/mozbase/moztest/moztest/resolve.py
@@ -70,11 +70,6 @@ TEST_SUITES = {
         'mach_command': 'firefox-ui-update',
         'kwargs': {},
     },
-    'check-spidermonkey': {
-        'aliases': ('sm',),
-        'mach_command': 'check-spidermonkey',
-        'kwargs': {'valgrind': False},
-    },
     # TODO(ato): integrate geckodriver tests with moz.build
     'geckodriver': {
         'aliases': ('testing/geckodriver',),