summaryrefslogtreecommitdiffstats
path: root/llvm/utils/lit
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2014-06-16 20:18:41 +0000
committerHans Wennborg <hans@hanshq.net>2014-06-16 20:18:41 +0000
commitf9484b24b30101251207cddbae17dc923c239230 (patch)
treedecc772cdcbbe91aef60f39aecd9ef2f0b36f858 /llvm/utils/lit
parent6af2969a61f8c7a61abc777ce32c3f23dae4758c (diff)
downloadbcm5719-llvm-f9484b24b30101251207cddbae17dc923c239230.tar.gz
bcm5719-llvm-f9484b24b30101251207cddbae17dc923c239230.zip
Revert "lit: warn when passed invalid pathname" (r210597)
It was pointed out that this breaks the "virtual test discovery" mechanism, which allows for narming tests in the test exec root. Reverting until I can figure out how to fix this. llvm-svn: 211048
Diffstat (limited to 'llvm/utils/lit')
-rw-r--r--llvm/utils/lit/lit/discovery.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/llvm/utils/lit/lit/discovery.py b/llvm/utils/lit/lit/discovery.py
index 8f22b247752..c3c0f283b55 100644
--- a/llvm/utils/lit/lit/discovery.py
+++ b/llvm/utils/lit/lit/discovery.py
@@ -200,7 +200,9 @@ def find_tests_for_inputs(lit_config, inputs):
# Expand '@...' form in inputs.
actual_inputs = []
for input in inputs:
- if input.startswith('@'):
+ if os.path.exists(input) or not input.startswith('@'):
+ actual_inputs.append(input)
+ else:
f = open(input[1:])
try:
for ln in f:
@@ -209,10 +211,6 @@ def find_tests_for_inputs(lit_config, inputs):
actual_inputs.append(ln)
finally:
f.close()
- elif os.path.exists(input):
- actual_inputs.append(input)
- else:
- lit_config.warning('no such file or directory: %r' % input)
# Load the tests from the inputs.
tests = []
OpenPOWER on IntegriCloud