Bug 1436612 - Remove the mozharness copy of tooltool.py r=glandium

Remove the mozharness copy of tooltool.py from mozilla-central.

Continue to keep a tooltool.py instance in the same path in mozharness.zip, copied from mozbuild.

Where it's simple, switch to use the mozbuild instance, but keep some mozharness tooltool.py references (when based on mozharness.zip).

Also make a minor change to mozproxy which had a bug in its mozharness-detection logic.

Differential Revision: https://phabricator.services.mozilla.com/D167223
This commit is contained in:
Geoff Brown 2023-01-20 15:26:32 +00:00
parent 8989546400
commit 1281f38a76
5 changed files with 9 additions and 1682 deletions

View file

@ -4,5 +4,5 @@
path:tools/lint/eslint/ path:tools/lint/eslint/
path:testing/performance path:testing/performance
path:testing/condprofile path:testing/condprofile
path:testing/mozharness/external_tools/tooltool.py path:python/mozbuild/mozbuild/action/tooltool.py
glob:**/perftest_*.js glob:**/perftest_*.js

View file

@ -333,6 +333,12 @@ ARCHIVE_FILES = {
"base": "third_party/python/packaging", "base": "third_party/python/packaging",
"pattern": "**", "pattern": "**",
}, },
{
"source": buildconfig.topsrcdir,
"base": "python/mozbuild/mozbuild/action",
"pattern": "tooltool.py",
"dest": "external_tools",
},
], ],
"reftest": [ "reftest": [
{"source": buildconfig.topobjdir, "base": "_tests", "pattern": "reftest/**"}, {"source": buildconfig.topobjdir, "base": "_tests", "pattern": "reftest/**"},

View file

@ -96,7 +96,7 @@ def tooltool_download(manifest, run_local, raptor_dir):
tooltool_path = None tooltool_path = None
for path in TOOLTOOL_PATHS: for path in TOOLTOOL_PATHS:
if os.path.exists(os.path.dirname(path)): if os.path.exists(path):
tooltool_path = path tooltool_path = path
break break
if tooltool_path is None: if tooltool_path is None:

View file

@ -30,7 +30,7 @@ EMULATOR_AUTH_FILE = os.path.join(
os.path.expanduser("~"), ".emulator_console_auth_token" os.path.expanduser("~"), ".emulator_console_auth_token"
) )
TOOLTOOL_PATH = "testing/mozharness/external_tools/tooltool.py" TOOLTOOL_PATH = "python/mozbuild/mozbuild/action/tooltool.py"
TRY_URL = "https://hg.mozilla.org/try/raw-file/default" TRY_URL = "https://hg.mozilla.org/try/raw-file/default"

File diff suppressed because it is too large Load diff