diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-05-03 14:51:11 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-05-04 14:24:07 +0100 |
| commit | 581f76e2c0217c5f4c33652ce526bac65ce8ebed (patch) | |
| tree | 86c6e652e3e44ce0720cd25435332211f123a0f6 | |
| parent | 74773a6ba77719eb74103ca21b38393d5d608bb2 (diff) | |
| download | morph-581f76e2c0217c5f4c33652ce526bac65ce8ebed.tar.gz | |
Make cmdtests set up repo-aliases and use prefixed reponames
| -rwxr-xr-x | tests.as-root/setup | 4 | ||||
| -rwxr-xr-x | tests.branching/setup | 5 | ||||
| -rwxr-xr-x | tests/setup | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/tests.as-root/setup b/tests.as-root/setup index 004c0ceb..0b78ef9f 100755 --- a/tests.as-root/setup +++ b/tests.as-root/setup @@ -93,7 +93,7 @@ cat <<EOF > hello-stratum.morph "sources": [ { "name": "hello", - "repo": "chunk-repo", + "repo": "test:chunk-repo", "ref": "farrokh" } ] @@ -119,7 +119,7 @@ git commit --quiet -m "add morphs" # Create a morph configuration file. cat <<EOF > "$DATADIR/morph.conf" [config] -git-base-url = file://$DATADIR/ +repo-alias = test=file://$DATADIR/#file://$DATADIR/ cachedir = $DATADIR/cache log = $DATADIR/morph.log keep-path = true diff --git a/tests.branching/setup b/tests.branching/setup index 261e7142..3b9b9381 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -28,7 +28,7 @@ set -eu # Create a morph configuration file cat <<EOF > "$DATADIR/morph.conf" [config] -git-base-url = file://$DATADIR/ +repo-alias = test=file://$DATADIR/#file://$DATADIR/ cachedir = $DATADIR/mine/.morph/cache log = $DATADIR/morph.log keep-path = true @@ -61,7 +61,8 @@ cat <<EOF > "$DATADIR/morphs/hello-stratum.chunk" "sources": [ { "name": "hello", - "ref": "master" + "ref": "master", + "repo": "test:hello" } ] } diff --git a/tests/setup b/tests/setup index 004c0ceb..84cf1d7e 100755 --- a/tests/setup +++ b/tests/setup @@ -93,7 +93,7 @@ cat <<EOF > hello-stratum.morph "sources": [ { "name": "hello", - "repo": "chunk-repo", + "repo": "test:chunk-repo", "ref": "farrokh" } ] @@ -119,7 +119,7 @@ git commit --quiet -m "add morphs" # Create a morph configuration file. cat <<EOF > "$DATADIR/morph.conf" [config] -git-base-url = file://$DATADIR/ +repo-alias = test:file://$DATADIR/#file://$DATADIR/ cachedir = $DATADIR/cache log = $DATADIR/morph.log keep-path = true |