From 1171524232347e4c8fbd47409577c5e988ebc6d6 Mon Sep 17 00:00:00 2001 Message-Id: <1171524232347e4c8fbd47409577c5e988ebc6d6.1714158578.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 27 Jun 2011 08:57:21 +0100 Subject: [PATCH] server/tests.at: Fix TRIPECTL_INTERACT argument order. Organization: Straylight/Edgeware From: Mark Wooding For some reason, the TRIPECTL_INTERACT macro reverses its arguments, making the first be an argument to `tripectl' and the second be the script to connect to it. Only neither call site actually passes the second argument; instead, both of them pass the script in the first. Since actually the script begins with a newline, it gets run after `tripectl' finishes in the same side of the coprocess lash-up. I have no idea how this has ever worked in the past. I certainly know that it doesn't work any more. So fix it. --- server/tests.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/tests.at b/server/tests.at index 38961e1d..6057d270 100644 --- a/server/tests.at +++ b/server/tests.at @@ -107,7 +107,7 @@ rm -f pipe-$1; mknod pipe-$1 p ## TRIPECTL_INTERACT(ARGS, SHELLSTUFF) m4_define([TRIPECTL_INTERACT], [ exec 3<&1 - COPROCESSES([client], [exec 4>&1 1>&3 $2], [TRIPECTL $1]) + COPROCESSES([client], [exec 4>&1 1>&3 $1], [TRIPECTL $2]) ]) ## TRIPECTL_COMMAND(CMD, EXPECT) -- [mdw]