diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-01-31 12:20:11 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-20 16:51:14 +0000 |
commit | 2ce8a926e858c06f76c7875dbd28616613f541dc (patch) | |
tree | 2259eb73e429229acfba61b933fe2911ecc6ddb2 /tests.build/stratum-overlap-warns.setup | |
parent | 8d9a939630bc677c2d2e7c4202a400f9bc0ab3ad (diff) | |
download | morph-2ce8a926e858c06f76c7875dbd28616613f541dc.tar.gz |
tests.build: Don't build individual chunks or strata
We can't rely on this being possible any more. It was mostly only used
for testing in any case.
Diffstat (limited to 'tests.build/stratum-overlap-warns.setup')
-rwxr-xr-x | tests.build/stratum-overlap-warns.setup | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests.build/stratum-overlap-warns.setup b/tests.build/stratum-overlap-warns.setup index ef771794..520a37a1 100755 --- a/tests.build/stratum-overlap-warns.setup +++ b/tests.build/stratum-overlap-warns.setup @@ -25,9 +25,9 @@ morphsrepo="$DATADIR/morphs-repo" cd "$morphsrepo" git checkout --quiet -b overlap master -cat <<EOF >overlap-stratum.morph +cat <<EOF >hello-stratum.morph { - "name": "overlap-stratum", + "name": "hello-stratum", "kind": "stratum", "chunks": [ { @@ -57,8 +57,9 @@ cat <<EOF >overlap-stratum.morph ] } EOF -git add overlap-stratum.morph -git commit --quiet -m "add overlapping stratum" +sed -i 's/master/overlap/' hello-system.morph +git add hello-stratum.morph hello-system.morph +git commit --quiet -m "Make hello stratum contain overlaps" cd "$chunkrepo" git checkout --quiet -b overlap master |