From: Zachary Turner <zturner@google.com>
Date: Mon, 18 Sep 2017 23:36:35 +0000 (+0000)
Subject: [lit] Use realpath when adding to the config map.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36409f332619d1ee97147eb96160f53a0d5f707d;p=llvm

[lit] Use realpath when adding to the config map.

Since the path a user specifies to the llvm-lit script might be
different than the source tree they built from (since they could
be behind different symlinks), we need to use realpath to make
sure that path comparisons work as expected.

Even better would be to use a custom dictionary comparison with
actual file equivalence comparison semantics, but this is the
least friction to unbreak things for now.

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

diff --git a/utils/lit/lit/discovery.py b/utils/lit/lit/discovery.py
index a5902d365df..e276829db39 100644
--- a/utils/lit/lit/discovery.py
+++ b/utils/lit/lit/discovery.py
@@ -48,6 +48,7 @@ def getTestSuite(item, litConfig, cache):
         # configuration to load instead.
         config_map = litConfig.params.get('config_map')
         if config_map:
+            cfgpath = os.path.realpath(cfgpath)
             cfgpath = os.path.normpath(cfgpath)
             cfgpath = os.path.normcase(cfgpath)
             target = config_map.get(cfgpath)
diff --git a/utils/llvm-lit/llvm-lit.in b/utils/llvm-lit/llvm-lit.in
index efad97ade7e..a12056dcc55 100755
--- a/utils/llvm-lit/llvm-lit.in
+++ b/utils/llvm-lit/llvm-lit.in
@@ -7,6 +7,7 @@ config_map = {}
 
 def map_config(source_dir, site_config):
     global config_map
+    source_dir = os.path.realpath(source_dir)
     source_dir = os.path.normpath(source_dir)
     source_dir = os.path.normcase(source_dir)
     site_config = os.path.normpath(site_config)