Test suite improvements

1 files changed, 47 insertions, 2 deletions

diff --git a/git.liw.fi.sh b/git.liw.fi.sh
index c893698..6f1163c 100644
--- a/git.liw.fi.sh
+++ b/git.liw.fi.sh
@@ -1,10 +1,55 @@
 gitano()
 {
-    ssh "$GITANO" "$@"
+    local keyname="$1"
+    shift
+    if [ "$keyname" = "liw" ]
+    then
+	ssh "$GITANO" "$@"
+    else
+	SSH_AUTH_SOCK= ssh -F "ssh.conf" -i "$keyname.key" "$GITANO" "$@"
+    fi
 }
 
 die()
 {
     echo "$@" 1>&2
     exit 1
-}
\ No newline at end of file
+}
+
+attempt()
+{
+    if "$@" > "$DATADIR/attempt.stdout" 2> "$DATADIR/attempt.stderr"
+    then
+	echo 0 > "$DATADIR/attempt.exit"
+    else
+	echo $? > "$DATADIR/attempt.exit"
+    fi
+}
+
+clone_using_git()
+{
+    local dir="$1/$2"
+    local url="git://$GITHOST/$2"
+    rm -rf "$dir"
+    mkdir -p "$dir"
+    if [ "$1" = liw ]
+    then
+	git clone "$url" "$dir"
+    else
+	SSH_AUTH_SOCK= git clone "$url" "$dir"
+    fi
+}
+
+clone_using_ssh()
+{
+    local dir="$1/$2"
+    local url="ssh://$GITANO/$2"
+    rm -rf "$dir"
+    mkdir -p "$dir"
+    if [ "$1" = liw ]
+    then
+	git clone "$url" "$dir"
+    else
+	PATH="$SRCDIR:$PATH" git clone "$url" "$dir"
+    fi
+}