From 265ca535ab1c208749c05fbbb2d18ddd0047dd65 Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Tue, 14 Mar 2017 20:04:46 +0000 Subject: [CMake] Override debugserver to use the build tree on Darwin This patch adds support to the test suite for overriding the path to debugserver, and uses the override to point to the build tree's debugserver on Darwin. llvm-svn: 297776 --- lldb/packages/Python/lldbsuite/test/dotest.py | 3 +++ lldb/packages/Python/lldbsuite/test/dotest_args.py | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'lldb/packages/Python') diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 6b6b2574e63..122c51432fc 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -364,6 +364,9 @@ def parseOptionsAndInitTestdirs(): if args.executable: lldbtest_config.lldbExec = os.path.realpath(args.executable) + + if args.server: + os.environ['LLDB_DEBUGSERVER_PATH'] = args.server if args.excluded: for excl_file in args.excluded: diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py index fc896d53c0b..29150562d6d 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest_args.py +++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py @@ -123,6 +123,10 @@ def create_parser(): '--executable', metavar='executable-path', help='The path to the lldb executable') + group.add_argument( + '--server', + metavar='server-path', + help='The path to the debug server executable to use') group.add_argument( '-s', metavar='name', -- cgit v1.2.3