JDevlieghere created this revision.
JDevlieghere added reviewers: davide, jasonmolenda.
Herald added a subscriber: teemperor.
Herald added a project: LLDB.
Now that all supported build systems create a valid `dotest.py` invocation, we
no longer need to guess the directory where any of the tools live. The current
logic is also incomplete: it doesn't try to find any other tools than
FileCheck, such as dsymutil for example. Finally, if no FileCheck is provided,
we should simply warn and skip these tests, but that's not part of this patch.
Repository:
rLLDB LLDB
https://reviews.llvm.org/D66893
Files:
lldb/packages/Python/lldbsuite/test/dotest.py
Index: lldb/packages/Python/lldbsuite/test/dotest.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/dotest.py
+++ lldb/packages/Python/lldbsuite/test/dotest.py
@@ -295,13 +295,6 @@
# target. However, when invoking dotest.py directly, a valid
--filecheck
# option needs to be given.
configuration.filecheck = os.path.abspath(args.filecheck)
- else:
- outputPaths = get_llvm_bin_dirs()
- for outputPath in outputPaths:
- candidatePath = os.path.join(outputPath, 'FileCheck')
- if is_exe(candidatePath):
- configuration.filecheck = candidatePath
- break
if not configuration.get_filecheck_path():
logging.warning('No valid FileCheck executable; some tests may
fail...')
@@ -552,34 +545,6 @@
return result
-def get_llvm_bin_dirs():
- """
- Returns an array of paths that may have the llvm/clang/etc binaries
- in them, relative to this current file.
- Returns an empty array if none are found.
- """
- result = []
-
- lldb_root_path = os.path.join(
- os.path.dirname(__file__), "..", "..", "..", "..")
- paths_to_try = [
- "llvm-build/Release+Asserts/x86_64/bin",
- "llvm-build/Debug+Asserts/x86_64/bin",
- "llvm-build/Release/x86_64/bin",
- "llvm-build/Debug/x86_64/bin",
- "llvm-build/Ninja-DebugAssert/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-DebugAssert+asan/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-ReleaseAssert/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-ReleaseAssert+asan/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-RelWithDebInfoAssert/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-RelWithDebInfoAssert+asan/llvm-macosx-x86_64/bin",
- ]
- for p in paths_to_try:
- path = os.path.join(lldb_root_path, p)
- if os.path.exists(path):
- result.append(path)
-
- return result
def setupSysPath():
"""
Index: lldb/packages/Python/lldbsuite/test/dotest.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/dotest.py
+++ lldb/packages/Python/lldbsuite/test/dotest.py
@@ -295,13 +295,6 @@
# target. However, when invoking dotest.py directly, a valid --filecheck
# option needs to be given.
configuration.filecheck = os.path.abspath(args.filecheck)
- else:
- outputPaths = get_llvm_bin_dirs()
- for outputPath in outputPaths:
- candidatePath = os.path.join(outputPath, 'FileCheck')
- if is_exe(candidatePath):
- configuration.filecheck = candidatePath
- break
if not configuration.get_filecheck_path():
logging.warning('No valid FileCheck executable; some tests may fail...')
@@ -552,34 +545,6 @@
return result
-def get_llvm_bin_dirs():
- """
- Returns an array of paths that may have the llvm/clang/etc binaries
- in them, relative to this current file.
- Returns an empty array if none are found.
- """
- result = []
-
- lldb_root_path = os.path.join(
- os.path.dirname(__file__), "..", "..", "..", "..")
- paths_to_try = [
- "llvm-build/Release+Asserts/x86_64/bin",
- "llvm-build/Debug+Asserts/x86_64/bin",
- "llvm-build/Release/x86_64/bin",
- "llvm-build/Debug/x86_64/bin",
- "llvm-build/Ninja-DebugAssert/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-DebugAssert+asan/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-ReleaseAssert/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-ReleaseAssert+asan/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-RelWithDebInfoAssert/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-RelWithDebInfoAssert+asan/llvm-macosx-x86_64/bin",
- ]
- for p in paths_to_try:
- path = os.path.join(lldb_root_path, p)
- if os.path.exists(path):
- result.append(path)
-
- return result
def setupSysPath():
"""
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
