summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2011-09-29 12:28:25 +0100
committerLars Wirzenius <liw@liw.fi>2011-09-29 12:28:25 +0100
commite82f19d5c95b5a94582a85999c24410d98100099 (patch)
treea232ea4a8eee2faeb97492a735a76ad6730b8137 /tests
parent4277cde1f040f7aa3b913e12d8d847bea4a07408 (diff)
downloadmorph-e82f19d5c95b5a94582a85999c24410d98100099.tar.gz
Adapt cmdtest tests to chunk morphs no longer having a "source" field.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/hello-chunk.script6
-rwxr-xr-xtests/hello-stratum.script6
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/hello-chunk.script b/tests/hello-chunk.script
index 52e7bc68..63f3b96d 100755
--- a/tests/hello-chunk.script
+++ b/tests/hello-chunk.script
@@ -18,6 +18,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
tar -C "$DATADIR" -xf tests/hello-chunk.tar.gz
-cp tests/hello-chunk.morph "$DATADIR/hello-chunk.morph"
-./morph build "$DATADIR/hello-chunk.morph" --git-base-url "file://$DATADIR/"
-tar -tf "$DATADIR/hello.chunk" | LC_ALL=C sort
+./morph build "$DATADIR/hello/hello.morph" \
+ --chunk-repo="file://$DATADIR/hello" --chunk-ref=master
+tar -tf "$DATADIR/hello/hello.chunk" | LC_ALL=C sort
diff --git a/tests/hello-stratum.script b/tests/hello-stratum.script
index ec9d6929..6b42fb00 100755
--- a/tests/hello-stratum.script
+++ b/tests/hello-stratum.script
@@ -18,7 +18,9 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
tar -C "$DATADIR" -xf tests/hello-chunk.tar.gz
-cp tests/hello-chunk.morph tests/hello-stratum.morph "$DATADIR"
-./morph build "$DATADIR/hello-chunk.morph" --git-base-url "file://$DATADIR/"
+./morph build "$DATADIR/hello/hello.morph" \
+ --chunk-repo="file://$DATADIR/hello" --chunk-ref=master
+
+cp tests/hello-stratum.morph "$DATADIR"
./morph build "$DATADIR/hello-stratum.morph" --git-base-url "file://$DATADIR/"
tar -tf "$DATADIR/hello.stratum" | LC_ALL=C sort