From 445e7696b8d68101827848443eb87dc4b6d96651 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 14 Jun 2012 20:35:17 +0100 Subject: [PATCH] tmpdir: rename "tmp" in run() to "testtmp" --- runner/adt-run | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runner/adt-run b/runner/adt-run index e8cf85f..8df4bf4 100755 --- a/runner/adt-run +++ b/runner/adt-run @@ -1155,17 +1155,17 @@ class Test: if 'needs-root' not in t.restriction_names and opts.user is not None: tfl = ['su',opts.user,'-c',tf] - tmp = '%s%s-tmp' % (testbed.scratch.read(True), t.what) + testtmp = '%s%s-testtmp' % (testbed.scratch.read(True), t.what) script = 'rm -rf -- "$1"; mkdir -- "$1"' if opts.user: script += '; chown %s "$1"' % opts.user if 'rw-build-tree' in t.restriction_names: script += '; chown -R %s "$2"' % opts.user - xenv = ['TMPDIR=%s' % tmp] + xenv = ['TMPDIR=%s' % testtmp] rc = testbed.execute('mktmpdir-'+t.what, ['sh','-xec',script,'x',xenv=xenv,tree.read(True)]) if rc: bomb("could not create test tmp `%s', exit code %d" - % (tmp, rc)) + % (testtmp, rc)) else: tfl = [tf] -- 2.30.2