Add a %basename substitution

[• rafael]

Summary

This will be used to avoid various call to basename in the asan test.

[filcab]

LGTM

[rnk]

utils/lit/lit/TestRunner.py

704

%basename doesn't seem like a very obvious substitution to me. It should be equivalent to the basename of the source path. Can you think of a more intuitive name for it? %sbase? %sbasename? %sourcebasename?

We have an existing convention that capital letters are the dirname of that substitution, which is OK, but I can't think of another convention that would get the basename of that letter.

I guess I like %sourcebasename best. It's long and descriptive, but this is only used inside sanitizer lit.common.cfg to form other more high-level substitutions.

[rnk]

utils/lit/lit/TestRunner.py

704

%basename_t sounds good. You're right, I thought you were doing the basename of %t before adding .tmp, which would make %basename_s and %basename_t the same.

[rnk]

lgtm

utils/lit/lit/TestRunner.py

if normalize_slashes:
         sourcedir = sourcedir.replace('\\', '/')
         tmpDir = tmpDir.replace('\\', '/')
         tmpBase = tmpBase.replace('\\', '/')
 
     # We use #_MARKER_# to hide %% while we do the other substitutions.
     substitutions = []
     substitutions.extend([('%%', '#_MARKER_#')])
     substitutions.extend(test.config.substitutions)
+    tmpName = tmpBase + '.tmp'
+    baseName = os.path.basename(tmpBase)
     substitutions.extend([('%s', sourcepath),
                           ('%S', sourcedir),
                           ('%p', sourcedir),
                           ('%{pathsep}', os.pathsep),
-                          ('%t', tmpBase + '.tmp'),
+                          ('%t', tmpName),
+                          ('%basename', baseName),
                           ('%T', tmpDir),
                           ('#_MARKER_#', '%')])
 
     # "%/[STpst]" should be normalized.
     substitutions.extend([
             ('%/s', sourcepath.replace('\\', '/')),
             ('%/S', sourcedir.replace('\\', '/')),
             ('%/p', sourcedir.replace('\\', '/')),