diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2011-11-03 16:42:32 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2011-11-03 16:42:32 +0000 |
| commit | 4942f4c77687980191b41b07104e9e9e49ae4fc8 (patch) | |
| tree | 999143235c8af03ea6a95e38e90c35a830e64a44 /tests | |
| parent | a51329ba742b008712a7ad3e3f6c44b2cadc79f6 (diff) | |
| download | morph-4942f4c77687980191b41b07104e9e9e49ae4fc8.tar.gz | |
Fix cmdtest tests to work with current morph usage
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/hello-chunk.script | 4 | ||||
| -rw-r--r-- | tests/hello-chunk.tar.gz | bin | 9489 -> 10116 bytes | |||
| -rwxr-xr-x | tests/hello-stratum.script | 2 | ||||
| -rw-r--r-- | tests/hello-stratum.stdout | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/tests/hello-chunk.script b/tests/hello-chunk.script index cdfd7437..1a7edde2 100755 --- a/tests/hello-chunk.script +++ b/tests/hello-chunk.script @@ -20,7 +20,7 @@ set -e tar -C "$DATADIR" -xf tests/hello-chunk.tar.gz -./morph --no-default-configs build "$DATADIR/hello/hello.morph" \ - --chunk-repo="file://$DATADIR/hello" --chunk-ref=master \ +./morph --no-default-configs build hello master hello.morph \ + --git-base-url "file://$DATADIR/" \ --cachedir="$DATADIR" tar -tf "$DATADIR/"*.chunk | LC_ALL=C sort | sed '/^\.\/./s:^\./::' diff --git a/tests/hello-chunk.tar.gz b/tests/hello-chunk.tar.gz Binary files differindex 4fcc670b..dad05cb5 100644 --- a/tests/hello-chunk.tar.gz +++ b/tests/hello-chunk.tar.gz diff --git a/tests/hello-stratum.script b/tests/hello-stratum.script index 0e53cd51..40bebfa1 100755 --- a/tests/hello-stratum.script +++ b/tests/hello-stratum.script @@ -21,7 +21,7 @@ set -e tar -C "$DATADIR" -xf tests/hello-chunk.tar.gz -./morph --no-default-configs build "tests/hello-stratum.morph" \ +./morph --no-default-configs build hello master hello-stratum.morph \ --git-base-url "file://$DATADIR/" \ --cachedir="$DATADIR" tar -tf "$DATADIR/"*.stratum | LC_ALL=C sort | sed '/^\.\/./s:^\./::' diff --git a/tests/hello-stratum.stdout b/tests/hello-stratum.stdout index c87d9b5c..12c0792a 100644 --- a/tests/hello-stratum.stdout +++ b/tests/hello-stratum.stdout @@ -1,5 +1,6 @@ ./ baserock/ +baserock/hello-stratum.meta baserock/hello.meta usr/ usr/local/ |