llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Vladislav Dzhidzhoev (dzhidzhoev) <details> <summary>Changes</summary> This argument allows to specify the path to make which is used by LLDB API tests to compile test programs. It might come in handy for setting up cross-platform remote runs of API tests on Windows host. It can be used to override the make path of LLDB API tests using `LLDB_TEST_USER_ARGS` argument: ``` cmake ... -DLLDB_TEST_USER_ARGS="...;--make;C:\\Path\\to\\make.exe;..." ... ``` --- Full diff: https://github.com/llvm/llvm-project/pull/93883.diff 4 Files Affected: - (modified) lldb/packages/Python/lldbsuite/test/builders/builder.py (+3-1) - (modified) lldb/packages/Python/lldbsuite/test/configuration.py (+1) - (modified) lldb/packages/Python/lldbsuite/test/dotest.py (+2) - (modified) lldb/packages/Python/lldbsuite/test/dotest_args.py (+6) ``````````diff diff --git a/lldb/packages/Python/lldbsuite/test/builders/builder.py b/lldb/packages/Python/lldbsuite/test/builders/builder.py index 21ea3530e24fc..178ce8bc3c490 100644 --- a/lldb/packages/Python/lldbsuite/test/builders/builder.py +++ b/lldb/packages/Python/lldbsuite/test/builders/builder.py @@ -40,7 +40,9 @@ 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": + if configuration.make_path is not None: + make = configuration.make_path + elif platform.system() == "FreeBSD" or platform.system() == "NetBSD": make = "gmake" else: make = "make" diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py index dbd4a2d72a15d..27eef040497d1 100644 --- a/lldb/packages/Python/lldbsuite/test/configuration.py +++ b/lldb/packages/Python/lldbsuite/test/configuration.py @@ -43,6 +43,7 @@ compiler = None dsymutil = None sdkroot = None +make_path = None # The overriden dwarf verison. dwarf_version = 0 diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 2e537e3fd3ce0..42b39bc6e2f7b 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -266,6 +266,8 @@ def parseOptionsAndInitTestdirs(): configuration.compiler = candidate break + if args.make: + configuration.make_path = args.make if args.dsymutil: configuration.dsymutil = args.dsymutil elif platform_system == "Darwin": diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py index 8b00c7a4d56e7..a0a840416c567 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest_args.py +++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py @@ -87,6 +87,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", `````````` </details> https://github.com/llvm/llvm-project/pull/93883 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
