diff options
| author | Zachary Turner <zturner@google.com> | 2017-09-21 17:02:08 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2017-09-21 17:02:08 +0000 |
| commit | 6b798196cb701ac407674b419b365ab8cd7703bc (patch) | |
| tree | 59015bc9898f7075248ea2f9f295a855ba8b901e /utils/lit | |
| parent | ab669421b20cbd5e5de2544d04781d0d1fc7c23b (diff) | |
[lit] Don't norm case when inserting into the config map.
This makes all paths lowercase on Windows, which seemed like a
good idea at the time, but it means that tests can't properly
use FileCheck to match expected path names.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@313889 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/lit')
| -rw-r--r-- | utils/lit/lit/discovery.py | 2 | ||||
| -rw-r--r-- | utils/lit/tests/Inputs/config-map-discovery/driver.py | 2 | ||||
| -rw-r--r-- | utils/lit/tests/Inputs/config-map-discovery/lit.alt.cfg | 2 | ||||
| -rw-r--r-- | utils/lit/tests/discovery.py | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/utils/lit/lit/discovery.py b/utils/lit/lit/discovery.py index 66c1181017a..aba7453e9d4 100644 --- a/utils/lit/lit/discovery.py +++ b/utils/lit/lit/discovery.py @@ -54,8 +54,6 @@ def getTestSuite(item, litConfig, cache): 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) if target: cfgpath = target diff --git a/utils/lit/tests/Inputs/config-map-discovery/driver.py b/utils/lit/tests/Inputs/config-map-discovery/driver.py index c1acdfc972f..b5344e8fb83 100644 --- a/utils/lit/tests/Inputs/config-map-discovery/driver.py +++ b/utils/lit/tests/Inputs/config-map-discovery/driver.py @@ -4,7 +4,7 @@ import sys main_config = sys.argv[1] -config_map = {lit.util.norm_path(main_config) : sys.argv[2]} +config_map = {os.path.realpath(main_config) : sys.argv[2]} builtin_parameters = {'config_map' : config_map} if __name__=='__main__': diff --git a/utils/lit/tests/Inputs/config-map-discovery/lit.alt.cfg b/utils/lit/tests/Inputs/config-map-discovery/lit.alt.cfg index 8462c81bdca..c7b303f50a0 100644 --- a/utils/lit/tests/Inputs/config-map-discovery/lit.alt.cfg +++ b/utils/lit/tests/Inputs/config-map-discovery/lit.alt.cfg @@ -5,5 +5,5 @@ config.suffixes = ['.txt'] config.test_format = lit.formats.ShTest() import os -config.test_exec_root = lit.util.norm_path(os.path.dirname(__file__)) +config.test_exec_root = os.path.realpath(os.path.dirname(__file__)) config.test_source_root = os.path.join(config.test_exec_root, "tests") diff --git a/utils/lit/tests/discovery.py b/utils/lit/tests/discovery.py index 41a2d6cad3d..c6b705c6293 100644 --- a/utils/lit/tests/discovery.py +++ b/utils/lit/tests/discovery.py @@ -37,7 +37,7 @@ # CHECK-CONFIG-MAP-OUT: -- Test Suites -- # CHECK-CONFIG-MAP-OUT: config-map - 2 tests # CHECK-CONFIG-MAP-OUT: Source Root: {{.*[/\\]config-map-discovery[/\\]tests}} -# CHECK-CONFIG-MAP-OUT: Exec Root : {{.*[/\\]tests[/\\]inputs[/\\]config-map-discovery}} +# CHECK-CONFIG-MAP-OUT: Exec Root : {{.*[/\\]tests[/\\]Inputs[/\\]config-map-discovery}} # CHECK-CONFIG-MAP-OUT: -- Available Tests -- # CHECK-CONFIG-MAP-OUT-NOT: invalid-test.txt # CHECK-CONFIG-MAP-OUT: config-map :: test1.txt |