Skip to content

Commit

Permalink
Bug 1436612 - Remove the mozharness copy of tooltool.py r=glandium
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gbrownmozilla committed Jan 20, 2023
1 parent a5a92e6 commit 023e679
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 1,682 deletions.
2 changes: 1 addition & 1 deletion build/sparse-profiles/perftest
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
path:tools/lint/eslint/
path:testing/performance
path:testing/condprofile
path:testing/mozharness/external_tools/tooltool.py
path:python/mozbuild/mozbuild/action/tooltool.py
glob:**/perftest_*.js
6 changes: 6 additions & 0 deletions python/mozbuild/mozbuild/action/test_archive.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,12 @@
"base": "third_party/python/packaging",
"pattern": "**",
},
{
"source": buildconfig.topsrcdir,
"base": "python/mozbuild/mozbuild/action",
"pattern": "tooltool.py",
"dest": "external_tools",
},
],
"reftest": [
{"source": buildconfig.topobjdir, "base": "_tests", "pattern": "reftest/**"},
Expand Down
2 changes: 1 addition & 1 deletion testing/mozbase/mozproxy/mozproxy/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def outputHandler(line):
tooltool_path = None

for path in TOOLTOOL_PATHS:
if os.path.exists(os.path.dirname(path)):
if os.path.exists(path):
tooltool_path = path
break
if tooltool_path is None:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
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"

Expand Down
Loading

0 comments on commit 023e679

Please sign in to comment.