Simply calls to morph by using tests/morph wrapper

7 files changed, 13 insertions, 64 deletions

diff --git a/tests/build-chunk-distributed-local.script b/tests/build-chunk-distributed-local.script
index 341bf9d2..db476ec3 100755
--- a/tests/build-chunk-distributed-local.script
+++ b/tests/build-chunk-distributed-local.script
@@ -19,19 +19,9 @@
 
 set -e
 
-# add working directory to PATH, assuming tests are performed in
-# the root directory of the morph repository
-export PATH="`pwd`:$PATH"
+tests/morph build-distributed chunk-repo farrokh hello.morph
 
-cache="$DATADIR/cache"
-log="$DATADIR/morph.log"
-./morph --no-default-configs \
-    build-distributed chunk-repo farrokh hello.morph \
-    --git-base-url="file://$DATADIR" \
-    --cachedir="$cache" --keep-path --no-distcc \
-    --log="$log" || cat "$log" 1>&2
-
-for chunk in "$cache/"*.chunk.*
+for chunk in "$DATADIR/cache/"*.chunk.*
 do
     echo "$chunk:" | sed 's/[^.]*//'
     tar -tf "$chunk" | LC_ALL=C sort | sed '/^\.\/./s:^\./::'
diff --git a/tests/build-chunk.script b/tests/build-chunk.script
index e33af6b5..89f036ba 100755
--- a/tests/build-chunk.script
+++ b/tests/build-chunk.script
@@ -19,14 +19,9 @@
 
 set -e
 
-cache="$DATADIR/cache"
-log="$DATADIR/morph.log"
-./morph --no-default-configs build chunk-repo farrokh hello.morph \
-    --git-base-url="file://$DATADIR" \
-    --cachedir="$cache" --keep-path --no-distcc \
-    --log="$log" || cat "$log" 1>&2
+tests/morph build chunk-repo farrokh hello.morph
 
-for chunk in "$cache/"*.chunk.*
+for chunk in "$DATADIR/cache/"*.chunk.*
 do
     echo "$chunk:" | sed 's/[^.]*//'
     tar -tf "$chunk" | LC_ALL=C sort | sed '/^\.\/./s:^\./::'
diff --git a/tests/build-stratum-distributed-local.script b/tests/build-stratum-distributed-local.script
index 8c8d645e..2e19fdb5 100755
--- a/tests/build-stratum-distributed-local.script
+++ b/tests/build-stratum-distributed-local.script
@@ -19,13 +19,5 @@
 
 set -e
 
-export PATH="`pwd`:$PATH"
-
-cache="$DATADIR/cache"
-log="$DATADIR/morph.log"
-./morph --no-default-configs \
-    build-distributed morphs-repo master hello-stratum.morph \
-    --git-base-url="file://$DATADIR" \
-    --cachedir="$cache" --keep-path --no-distcc \
-    --log="$log" || cat "$log" 1>&2
-tar -tf "$cache/"*.stratum.* | LC_ALL=C sort | sed '/^\.\/./s:^\./::'
+tests/morph build-distributed morphs-repo master hello-stratum.morph
+tar -tf "$DATADIR/cache/"*.stratum.* | LC_ALL=C sort | sed '/^\.\/./s:^\./::'
diff --git a/tests/build-stratum.script b/tests/build-stratum.script
index 4680f25f..49b0c9a7 100755
--- a/tests/build-stratum.script
+++ b/tests/build-stratum.script
@@ -19,10 +19,5 @@
 
 set -e
 
-cache="$DATADIR/cache"
-log="$DATADIR/morph.log"
-./morph --no-default-configs build morphs-repo master hello-stratum.morph \
-    --git-base-url="file://$DATADIR" \
-    --cachedir="$cache" --keep-path --no-distcc \
-    --log="$log" || cat "$log" 1>&2
-tar -tf "$cache/"*.stratum.* | LC_ALL=C sort | sed '/^\.\/./s:^\./::'
+tests/morph build morphs-repo master hello-stratum.morph
+tar -tf "$DATADIR/cache/"*.stratum.* | LC_ALL=C sort | sed '/^\.\/./s:^\./::'
diff --git a/tests/name-clash.script b/tests/name-clash.script
index 0d989732..b63fbfac 100755
--- a/tests/name-clash.script
+++ b/tests/name-clash.script
@@ -51,16 +51,10 @@ EOF
 )
 
 # build the dodgy chunk
-./morph --no-default-configs build chunk-repo farrokh goodbye.morph \
-    --git-base-url="file://$DATADIR" \
-    --cachedir="$cache" --keep-path --no-distcc \
-    --log="$log" || cat "$log" 1>&2
+tests/morph build chunk-repo farrokh goodbye.morph
 
 # build a stratum 
-./morph --no-default-configs build morphs-repo master hello-stratum.morph \
-    --git-base-url="file://$DATADIR" \
-    --cachedir="$cache" --keep-path --no-distcc \
-    --log="$log" || cat "$log" 1>&2
+tests/morph build morphs-repo master hello-stratum.morph
 
 # unpack it and check the contents
 INSTDIR="$DATADIR"/unpack
diff --git a/tests/rebuild-cached-stratum.script b/tests/rebuild-cached-stratum.script
index 4d6193e8..000db170 100755
--- a/tests/rebuild-cached-stratum.script
+++ b/tests/rebuild-cached-stratum.script
@@ -38,11 +38,7 @@ log="$DATADIR/morph.log"
  git commit --quiet -m "rebuild-cached-stratum" -a)
 
 # Build the first time.
-./morph --no-default-configs \
-    build morphs-repo rebuild-cached-stratum hello-stratum.morph \
-    --git-base-url="file://$DATADIR" \
-    --cachedir="$cache" --keep-path --no-distcc \
-    --log="$log" || cat "$log" 1>&2
+tests/morph build morphs-repo rebuild-cached-stratum hello-stratum.morph
 echo "first build:"
 (cd "$cache" && ls *.chunk.*  *.stratum.* | sed 's/^[^.]*\./ /' | 
  LC_ALL=C sort)
@@ -53,11 +49,7 @@ echo "first build:"
  git commit --quiet -am change)
 
 # Rebuild.
-./morph --no-default-configs \
-    build morphs-repo rebuild-cached-stratum hello-stratum.morph \
-    --git-base-url="file://$DATADIR" \
-    --cachedir="$cache" --keep-path --no-distcc \
-    --log="$log" || cat "$log" 1>&2
+tests/morph build morphs-repo rebuild-cached-stratum hello-stratum.morph
 echo "second build:"
 (cd "$cache" && ls *.chunk.*  *.stratum.* | sed 's/^[^.]*\./ /' | 
  LC_ALL=C sort)
diff --git a/tests/show-dependencies.script b/tests/show-dependencies.script
index 6c59c78b..d283efab 100755
--- a/tests/show-dependencies.script
+++ b/tests/show-dependencies.script
@@ -20,14 +20,5 @@
 
 set -e
 
-cache="$DATADIR/cache"
-log="$DATADIR/morph.log"
+tests/morph show-dependencies test-repo master xfce-core.morph
 
-./morph show-dependencies                           \
-    test-repo master xfce-core.morph                \
-    --no-default-configs                            \
-    --git-base-url="file://$DATADIR"                \
-    --cachedir="$cache"                             \
-    --keep-path                                     \
-    --no-distcc                                     \
-    --log="$log"