Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mach test cargo target dir #27169

Merged
merged 1 commit into from Jul 4, 2020
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -4,6 +4,7 @@

import multiprocessing
import os
from os import path
import sys
import mozlog
import grouping_formatter
@@ -72,7 +73,10 @@ def set_defaults(kwargs):
bin_name = "servo"
if sys.platform == "win32":
bin_name += ".exe"
bin_path = servo_path("target", bin_dir, bin_name)
if "CARGO_TARGET_DIR" in os.environ:
bin_path = path.join(os.environ["CARGO_TARGET_DIR"], bin_dir, bin_name)
else:
bin_path = servo_path("target", bin_dir, bin_name)

kwargs["binary"] = bin_path
kwargs["webdriver_binary"] = bin_path
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.