Add helper script for cleaning up test output

This refactors what scripts/test-morph did into its own helper
script, so that we can use it elsehwere. Then use it for
scripts/run-git-in too.

3 files changed, 43 insertions, 14 deletions

diff --git a/scripts/cmd-filter b/scripts/cmd-filter
new file mode 100755
index 00000000..d2f4f784
--- /dev/null
+++ b/scripts/cmd-filter
@@ -0,0 +1,40 @@
+#!/bin/sh
+# Copyright (C) 2012  Codethink Limited
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# Wrapper around morph for use by cmdtest tests. This does several things:
+#
+#   * simpler command lines for running morph, so that each test does not
+#     need to add --no-default-config and other options every time
+#   * replace temporary filenames ($DATADIR) in the output with a known
+#     string ("TMP"), so that test output is deterministic
+
+set -eu
+
+if "$@" > "$DATADIR/stdout" 2> "$DATADIR/stderr"
+then
+    exit=0
+else
+    exit=1
+fi
+
+sed -i "s,$DATADIR,TMP,g" "$DATADIR/stdout" "$DATADIR/stderr"
+cat "$DATADIR/stdout"
+cat "$DATADIR/stderr" 1>&2
+
+rm -f "$DATADIR/stdout" "$DATADIR/stderr"
+
+exit "$exit"
+
diff --git a/scripts/run-git-in b/scripts/run-git-in
index 55bc3ecd..80b87d1a 100755
--- a/scripts/run-git-in
+++ b/scripts/run-git-in
@@ -22,4 +22,4 @@ set -eu
 
 cd "$1"
 shift
-exec git "$@"
+"$SRCDIR/scripts/cmd-filter" git "$@"
diff --git a/scripts/test-morph b/scripts/test-morph
index 1101d2b3..3c9e1131 100755
--- a/scripts/test-morph
+++ b/scripts/test-morph
@@ -23,17 +23,6 @@
 
 set -eu
 
-if "$SRCDIR/morph" --no-default-config --config="$DATADIR/morph.conf" "$@" \
-    > "$DATADIR/stdout" 2> "$DATADIR/stderr"
-then
-    exit=0
-else
-    exit=1
-fi
-
-sed -i "s,$DATADIR,TMP,g" "$DATADIR/stdout" "$DATADIR/stderr"
-cat "$DATADIR/stdout"
-cat "$DATADIR/stderr" 1>&2
-
-exit "$exit"
+"$SRCDIR/scripts/cmd-filter" "$SRCDIR/morph" --no-default-config \
+    --config="$DATADIR/morph.conf" "$@"