This revision was automatically updated to reflect the committed changes.
Closed by commit rL370232: [dotest] Don't try to guess the llvm binary
dir. (authored by JDevlieghere, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
Changed prior to commit:
https://reviews.llvm.org/D66893?vs=217677&id=217680#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D66893/new/
https://reviews.llvm.org/D66893
Files:
lldb/trunk/packages/Python/lldbsuite/test/dotest.py
Index: lldb/trunk/packages/Python/lldbsuite/test/dotest.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py
+++ lldb/trunk/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/trunk/packages/Python/lldbsuite/test/dotest.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py
+++ lldb/trunk/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
