[lit] abs_path_preserve_drive - don't normalize path, leave this to the caller

As noted on D154130, this was preventing path matching between normalized/unnormalized paths on some windows builds.
This commit is contained in:
Simon Pilgrim
2023-08-02 13:43:05 +01:00
parent 5b19f42b63
commit 5ccfa15681
2 changed files with 3 additions and 3 deletions

View File

@@ -57,7 +57,7 @@ def getTestSuite(item, litConfig, cache):
config_map = litConfig.params.get("config_map")
if config_map:
cfgpath = util.abs_path_preserve_drive(cfgpath)
target = config_map.get(cfgpath)
target = config_map.get(os.path.normcase(cfgpath))
if target:
cfgpath = target

View File

@@ -138,12 +138,12 @@ def abs_path_preserve_drive(path):
# Since Python 3.8, os.path.realpath resolves sustitute drives,
# so we should not use it. In Python 3.7, os.path.realpath
# was implemented as os.path.abspath.
return os.path.normpath(os.path.abspath(path))
return os.path.abspath(path)
else:
# On UNIX, the current directory always has symbolic links resolved,
# so any program accepting relative paths cannot preserve symbolic
# links in paths and we should always use os.path.realpath.
return os.path.normpath(os.path.realpath(path))
return os.path.realpath(path)
def mkdir(path):
try: