Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions lldb/packages/Python/lldbsuite/test/builders/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ def getMake(self, test_subdir, test_name):
"""Returns the invocation for GNU make.
The first argument is a tuple of the relative path to the testcase
and its filename stem."""
if platform.system() == "FreeBSD" or platform.system() == "NetBSD":
make = "gmake"
else:
make = "make"

# Construct the base make invocation.
lldb_test = os.environ["LLDB_TEST"]
if not (
Expand All @@ -62,7 +57,7 @@ def getMake(self, test_subdir, test_name):
if not os.path.isfile(makefile):
makefile = os.path.join(build_dir, "Makefile")
return [
make,
configuration.make_path,
"VPATH=" + src_dir,
"-C",
build_dir,
Expand Down
1 change: 1 addition & 0 deletions lldb/packages/Python/lldbsuite/test/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
compiler = None
dsymutil = None
sdkroot = None
make_path = None

# The overriden dwarf verison.
dwarf_version = 0
Expand Down
7 changes: 7 additions & 0 deletions lldb/packages/Python/lldbsuite/test/dotest.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,13 @@ def parseOptionsAndInitTestdirs():
configuration.compiler = candidate
break

if args.make:
configuration.make_path = args.make
elif platform_system == "FreeBSD" or platform_system == "NetBSD":
configuration.make_path = "gmake"
else:
configuration.make_path = "make"

if args.dsymutil:
configuration.dsymutil = args.dsymutil
elif platform_system == "Darwin":
Expand Down
6 changes: 6 additions & 0 deletions lldb/packages/Python/lldbsuite/test/dotest_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ def create_parser():
),
)

group.add_argument(
"--make",
metavar="make",
dest="make",
help=textwrap.dedent("Specify which make to use."),
)
group.add_argument(
"--dsymutil",
metavar="dsymutil",
Expand Down