From: Reid Kleckner <rnk@google.com>
Date: Thu, 31 Aug 2017 21:56:14 +0000 (+0000)
Subject: [lit] Fix some issues with short paths in test discovery introduced in r312254
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf95626bdce740849ab0ea60939000549a7ecc05;p=llvm

[lit] Fix some issues with short paths in test discovery introduced in r312254

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@312288 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/lit/lit/discovery.py b/utils/lit/lit/discovery.py
index ea6143d8166..8876dcba8f2 100644
--- a/utils/lit/lit/discovery.py
+++ b/utils/lit/lit/discovery.py
@@ -59,7 +59,7 @@ def getTestSuite(item, litConfig, cache):
         return res
 
     # Canonicalize the path.
-    item = os.path.normpath(item)
+    item = os.path.normpath(os.path.join(os.getcwd(), item))
 
     # Skip files and virtual components.
     components = []
diff --git a/utils/lit/tests/discovery.py b/utils/lit/tests/discovery.py
index 3eea320ccfb..7d71436b0fe 100644
--- a/utils/lit/tests/discovery.py
+++ b/utils/lit/tests/discovery.py
@@ -90,6 +90,13 @@
 # RUN:   -j 1 --show-tests --show-suites -v > %t.out
 # RUN: FileCheck --check-prefix=CHECK-ASEXEC-INTREE < %t.out %s
 #
+# Try it again after cd'ing into the test suite using a short relative path.
+#
+# RUN: cd %{inputs}/exec-discovery-in-tree/obj/
+# RUN: %{lit} . \
+# RUN:   -j 1 --show-tests --show-suites -v > %t.out
+# RUN: FileCheck --check-prefix=CHECK-ASEXEC-INTREE < %t.out %s
+#
 #      CHECK-ASEXEC-INTREE:   exec-discovery-in-tree-suite - 1 tests
 # CHECK-ASEXEC-INTREE-NEXT:     Source Root: {{.*[/\\]exec-discovery-in-tree$}}
 # CHECK-ASEXEC-INTREE-NEXT:     Exec Root  : {{.*[/\\]exec-discovery-in-tree[/\\]obj$}}