From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 15 Jun 2012 00:39:04 +0000 (+0100)
Subject: tmpdir: fixes from testing
X-Git-Tag: debian/2.2.0~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1246e4fa02d678608fb60413e23d8bb86c220e4e;p=autopkgtest.git

tmpdir: fixes from testing
---

diff --git a/runner/adt-run b/runner/adt-run
index 0ce14d1..cd82451 100755
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -1154,23 +1154,26 @@ class Test:
 	if rc: bomb('failed to chmod +x %s' % tf)
 
 	testtmp = '%s%s-testtmp' % (testbed.scratch.read(True), t.what)
-	script = 'rm -rf -- "$@"; mkdir -- "$@"'
+
+	script = 'buildtree="$1"; shift\n'
+	script += 'rm -rf -- "$@"; mkdir -- "$@"\n'
 
 	if 'needs-root' not in t.restriction_names and opts.user is not None:
 		tfl = ['su',opts.user,'-c',tf]
 		if opts.user:
-			script += '; chown %s "$@"' % opts.user
+			script += 'chown %s "$@"\n' % opts.user
 			if 'rw-build-tree' in t.restriction_names:
-				script += '; chown -R %s "$2"' % opts.user
+				script += ('chown -R %s "$buildtree"\n'
+						 % opts.user)
 	else:
 		tfl = [tf]
 
 	test_tmpdir = testtmp+'/tmpdir'; xenv.append('TMPDIR=%s' % test_tmpdir)
-	test_addtmp = testtmp+'/addtmp'; xenv.append('ADTTMP=%s' % test_adttmp)
+	test_adttmp = testtmp+'/adttmp'; xenv.append('ADTTMP=%s' % test_adttmp)
 	rc = testbed.execute('mktmpdir-'+t.what,
-		['sh','-xec',script,'x',
-			test_tmpdir, test_adttmp, 
-			tree.read(True)])
+		['sh','-xec',script,'x', tree.read(True),
+			testtmp, test_tmpdir, test_adttmp, 
+			])
 	if rc: bomb("could not create test tmp dirs in `%s', exit code %d"
 			% (testtmp, rc))