X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=runner%2Fadt-run.1;h=2704728d4d110bd9b2b1db81403fe229dc7c867e;hb=629e736487dd1f47503472b3fe1e5e779d7e2357;hp=ff1a661efae13e3d9ad96d00445b62dfa225d06a;hpb=fa1c76250889f45f12d5d7d7f9e19d1672816831;p=autopkgtest.git

diff --git a/runner/adt-run.1 b/runner/adt-run.1
index ff1a661..2704728 100644
--- a/runner/adt-run.1
+++ b/runner/adt-run.1
@@ -31,7 +31,7 @@ host.  The package should be installed on the testbed.
 Specifies that tests from the built source tree
 .IR directory
 should be run.  Note that the packages that would normally be
-installed as a result of \fB*\fR in the tests' \fBDepends\fR field
+installed as a result of \fB@\fR in the tests' \fBDepends\fR field
 (which includes the case where the \fBDepends\fR field is not
 specified) are \fInot\fR installed.  The caller must explicitly
 instruct \fBadt-run\fR to install any relevant packages.
@@ -121,7 +121,7 @@ and
 for the log transcript.  If no \fIoutput-dir\fR is specified, or the
 path is specified to be on the testbed (ie, if \fB--output-dir\fR
 follows \fB--paths-testbed\fR), then the \fBlog\fR file is instead
-written to the temporary directory \fItmpdir\fR if one was specified,
+written to the temporary directory \fItmp\fR if one was specified,
 or otherwise no separate copy is made.  Note that the log transcript
 output will also be sent to \fBadt-run\fR's stderr unless
 \fB--quiet\fR is specified.
@@ -135,22 +135,23 @@ tests run as whatever user is provided.
 Prefixes
 .B debian/rules binary
 with
-.RB gain-root .  The default is not to use anything, except that if
+.RB gain-root .
+The default is not to use anything, except that if
 \fB--user\fR is supplied or root on the testbed is not available the
 default is \fBfakeroot\fR.
 .TP
-.BI --tmp-dir= tmpdir
-Specifies that \fItmpdir\fR should be used instead of a fresh
-temporary directory on the host.  \fItmpdir\fR will be created if
+.BI --tmp-dir= tmp
+Specifies that \fItmp\fR should be used instead of a fresh
+temporary directory on the host.  \fItmp\fR will be created if
 necessary, and emptied of all of its contents before \fBadt-run\fR
-starts, and it will not be cleaned out afterwards.  \fItmpdir\fR is
+starts, and it will not be cleaned out afterwards.  \fItmp\fR is
 not affected by \fB--paths-testbed\fR.
 .B NOTE
-again that all of the contents of \fItmpdir\fR will be \fBdeleted\fR.
+again that all of the contents of \fItmp\fR will be \fBdeleted\fR.
 .TP
 .BI --log-file= logfile
 Specifies that the trace log should be written to \fIlogfile\fR
-instead of to \fBlog\fR in \fIoutput-dir\fR or \fItmpdir\fR.
+instead of to \fBlog\fR in \fIoutput-dir\fR or \fItmp\fR.
 \fIlog-file\fR is not affected by \fB--paths-testbed\fR.
 .TP
 .BI --summary= summary
@@ -202,7 +203,7 @@ quantities of high-quality entropy.
 .BR -q " | " --quiet
 Do not send a copy of \fBadt-run\fR's trace logstream to stderr.  This
 option does not affect the copy sent to \fIlogfile\fR,
-\fIoutput-dir\fR or \fItmpdir\fR.  Note that without the trace
+\fIoutput-dir\fR or \fItmp\fR.  Note that without the trace
 logstream it can be very hard to diagnose problems.
 .TP
 \fB---\fR \fIvirt-server virt-server-arg\fR...