From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 27 Jun 2011 08:03:48 +0000 (+0100)
Subject: server/tests.at: Various minor cleanups.
X-Git-Tag: 1.0.0pre11~49
X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/commitdiff_plain/768a2316c32523753d544e831687c27e5276a9d1

server/tests.at: Various minor cleanups.

  * Remove stray `Keep' from comment.

  * Remove redundant `/' separator from a filename.

  * Fix `3<&1' to `3>&1', because it reflects the data flow better.
---

diff --git a/server/tests.at b/server/tests.at
index 6057d270..0a7e7855 100644
--- a/server/tests.at
+++ b/server/tests.at
@@ -55,9 +55,9 @@ rm -f $1/server-status
 > $1/expected-server-output
 > $1/expected-server-errors
 
-## Keep Autotest writes crap to standard output, which we don't want going to
-## the server.  So keep a copy of the standard output, do the pipe, and
-## recover the old stdout inside the group.
+## Autotest writes crap to standard output, which we don't want going to the
+## server.  So keep a copy of the standard output, do the pipe, and recover
+## the old stdout inside the group.
 exec 3>&1
 { (
 exec 1>&3 3>&-
@@ -65,7 +65,7 @@ exec 1>&3 3>&-
 ## Wait for the socket to appear.  Watch for the server crashing during
 ## initialization.  Busy waiting is evil, but it's the best I can do and
 ## not sleep for ages.  (Yes, a second on each test group is a long time.)
-while test ! -r $1//server-status && test ! -S $1/admin; do :; done
+while test ! -r $1/server-status && test ! -S $1/admin; do :; done
 
 ## Test body...
 $3
@@ -106,7 +106,7 @@ rm -f pipe-$1; mknod pipe-$1 p
 
 ## TRIPECTL_INTERACT(ARGS, SHELLSTUFF)
 m4_define([TRIPECTL_INTERACT], [
-  exec 3<&1
+  exec 3>&1
   COPROCESSES([client], [exec 4>&1 1>&3 $1], [TRIPECTL $2])
 ])