diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-08-28 15:31:29 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-08-29 15:16:28 +0100 |
| commit | ecefb2d1936221ccf21cbad6db2fe73cd229f4f5 (patch) | |
| tree | bdf91e898213f0daaa7d4c06598a920f096b5d79 /tests.branching | |
| parent | f2415383628cb22c5646d96b0e7bbfd6d0629072 (diff) | |
| download | morph-ecefb2d1936221ccf21cbad6db2fe73cd229f4f5.tar.gz | |
Strata contain "chunks", not "sources"
Rename "sources" field of stratum morphologies to "chunks".
Diffstat (limited to 'tests.branching')
| -rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 11 | ||||
| -rw-r--r-- | tests.branching/petrify.stdout | 8 | ||||
| -rwxr-xr-x | tests.branching/setup | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index 71038a16..e58e8187 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -1,5 +1,5 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph -index 77fb1d0..c5ed672 100644 +index 06ae459..ad8c08b 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph @@ -1,12 +1,14 @@ @@ -7,9 +7,7 @@ index 77fb1d0..c5ed672 100644 - "name": "hello-stratum", - "kind": "stratum", + "build-system": "manual", -+ "kind": "stratum", -+ "name": "hello-stratum", - "sources": [ + "chunks": [ { - "name": "hello", - "ref": "master", @@ -21,5 +19,8 @@ index 77fb1d0..c5ed672 100644 + "ref": "newbranch", + "repo": "baserock:hello" } - ] +- ] ++ ], ++ "kind": "stratum", ++ "name": "hello-stratum" } diff --git a/tests.branching/petrify.stdout b/tests.branching/petrify.stdout index 1ef133aa..ea0fb795 100644 --- a/tests.branching/petrify.stdout +++ b/tests.branching/petrify.stdout @@ -1,8 +1,6 @@ { "build-system": "manual", - "kind": "stratum", - "name": "hello-stratum", - "sources": [ + "chunks": [ { "build-depends": [], "morph": "hello", @@ -10,5 +8,7 @@ "ref": "f4d032b42c0134e67bdf19a43fa99072493667d7", "repo": "baserock:hello" } - ] + ], + "kind": "stratum", + "name": "hello-stratum" } diff --git a/tests.branching/setup b/tests.branching/setup index 84d1d545..b062f379 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -72,7 +72,7 @@ cat <<EOF > "$DATADIR/morphs/hello-stratum.morph" { "name": "hello-stratum", "kind": "stratum", - "sources": [ + "chunks": [ { "name": "hello", "ref": "master", |