From 0d24e380ff394782358da99b776a187d402142e9 Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Fri, 27 Nov 2015 14:21:01 +0000
Subject: Convert last cmdtests to yarns

The conversion was made so that the build command was used instead of
the build-morphology command.

Change-Id: I67c43d765ed603ecdd806bc649815526243b7b87
---
 yarns/morph.shell-lib | 53 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 18 deletions(-)

(limited to 'yarns/morph.shell-lib')

diff --git a/yarns/morph.shell-lib b/yarns/morph.shell-lib
index d9d29a07..01ea8ecd 100644
--- a/yarns/morph.shell-lib
+++ b/yarns/morph.shell-lib
@@ -26,6 +26,23 @@ case "$PYTHONPATH" in
 esac
 export PYTHONPATH
 
+# Added until it's fixed in upstream.
+# It's a solution to create an empty home directory each execution
+export HOME="$DATADIR/home"
+if [ ! -d "$HOME" ]
+then
+    mkdir "$HOME"
+fi
+
+# Generating a default git user to run the tests
+if ! test -r "$HOME/.gitconfig"
+then
+    cat > "$HOME/.gitconfig" <<EOF
+[user]
+     name = Tomjon Codethinker
+     email = tomjon@codethink.co.uk
+EOF
+fi
 
 # Run Morph from the source tree, ignoring any configuration files.
 # This way the test suite is not affected by any configuration the user
@@ -36,7 +53,12 @@ run_morph()
 {
     {
         set +e
-        "$SRCDIR"/morph --debug \
+        debug='--debug'
+        quiet="$(echo "$@" | grep '\-\-quiet')"
+        if $(echo "$@" | grep -q '\-\-quiet'); then
+            debug=
+        fi
+        "$SRCDIR"/morph $debug \
             --cachedir-min-space=0 --tempdir-min-space=0 \
             --no-default-config --config "$DATADIR/morph.conf" \
             --log="$DATADIR/log-$1"  \
@@ -85,23 +107,18 @@ run_in()
     (cd "$1" && shift && exec "$@")
 }
 
-# Added until it's fixed in upstream.
-# It's a solution to create an empty home directory each execution
-export HOME="$DATADIR/home"
-if [ ! -d "$HOME" ]
-then
-    mkdir "$HOME"
-fi
-
-# Generating a default git user to run the tests
-if ! test -r "$HOME/.gitconfig"
-then
-    cat > "$HOME/.gitconfig" <<EOF
-[user]
-     name = Tomjon Codethinker
-     email = tomjon@codethink.co.uk
-EOF
-fi
+find_alias () {
+    ALIASES="$1"
+    WHICH="$2"
+    for alias in $ALIASES; do
+        alias=$(echo $alias | sed -e's/,$//')
+        prefix=$(echo $alias | cut -d= -f1)
+        if test "x$WHICH" = "x$prefix"; then
+            echo $alias
+            exit 0
+        fi
+    done
+}
 
 start_cache_server(){
     mkfifo "$1"
-- 
cgit v1.2.1