summaryrefslogtreecommitdiff
path: root/utils
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
commitbaf9879290e81105719e15481c26749d82f32327 (patch)
treed6abd6d5845dbec0f381ea78d6acfa39857055ba /utils
parent73b142e65628d0014b5eb600b2c2d0a6e4388920 (diff)
downloadllvm-baf9879290e81105719e15481c26749d82f32327.tar.gz
llvm-baf9879290e81105719e15481c26749d82f32327.tar.bz2
llvm-baf9879290e81105719e15481c26749d82f32327.tar.xz
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211048 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
-rw-r--r--utils/lit/lit/discovery.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/utils/lit/lit/discovery.py b/utils/lit/lit/discovery.py
index 8f22b24775..c3c0f283b5 100644
--- a/utils/lit/lit/discovery.py
+++ b/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 = []