summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2011-08-26 19:05:18 +0000
committerDouglas Gregor <dgregor@apple.com>2011-08-26 19:05:18 +0000
commit0f9d34c71d4f4ea83912c45f99ed286557ea189c (patch)
treebbbdcd9a4fc4902637c70f54e2feafa7f4391deb /utils
parent86ce852a15f0c66601dcaf55644d8c4ec268906f (diff)
downloadllvm-0f9d34c71d4f4ea83912c45f99ed286557ea189c.tar.gz
llvm-0f9d34c71d4f4ea83912c45f99ed286557ea189c.tar.bz2
llvm-0f9d34c71d4f4ea83912c45f99ed286557ea189c.tar.xz
lit: Add %T as a replacement for the output directory
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138640 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
-rw-r--r--utils/lit/lit/TestRunner.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py
index 80d0ba1183..a40644cd18 100644
--- a/utils/lit/lit/TestRunner.py
+++ b/utils/lit/lit/TestRunner.py
@@ -397,7 +397,8 @@ def parseIntegratedTestScript(test, normalize_slashes=False):
sourcedir = os.path.dirname(sourcepath)
execpath = test.getExecPath()
execdir,execbase = os.path.split(execpath)
- tmpBase = os.path.join(execdir, 'Output', execbase)
+ tmpDir = os.path.join(execdir, 'Output')
+ tmpBase = os.path.join(tmpDir, execbase)
if test.index is not None:
tmpBase += '_%d' % test.index
@@ -414,6 +415,7 @@ def parseIntegratedTestScript(test, normalize_slashes=False):
('%S', sourcedir),
('%p', sourcedir),
('%t', tmpBase + '.tmp'),
+ ('%T', tmpDir),
# FIXME: Remove this once we kill DejaGNU.
('%abs_tmp', tmpBase + '.tmp'),
('#_MARKER_#', '%')])