diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-08-28 17:20:04 +0100 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-30 11:19:01 +0000 |
| commit | 2a071ef057c953e81e1b8bd9b714373b4dbb26c2 (patch) | |
| tree | bffd06cb8a9d0c825cdc2274b7b4c55adc07def6 /tests | |
| parent | ecefb2d1936221ccf21cbad6db2fe73cd229f4f5 (diff) | |
| download | morph-2a071ef057c953e81e1b8bd9b714373b4dbb26c2.tar.gz | |
Strata should be referred to with full repo/ref/morph triplets
This removes the requirement that all strata must be in the same
repo as the system morphology.
Both the system "strata" field and the stratum "build-depends" field
are affected.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/setup | 6 | ||||
| -rwxr-xr-x | tests/show-dependencies.setup | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/setup b/tests/setup index 19c400fa..25472dc7 100755 --- a/tests/setup +++ b/tests/setup @@ -109,7 +109,11 @@ cat <<EOF > hello-system.morph "system-kind": "syslinux-disk", "disk-size": "1G", "strata": [ - "hello-stratum" + { + "morph": "hello-stratum", + "repo": "test:morphs-repo", + "ref": "master" + } ] } EOF diff --git a/tests/show-dependencies.setup b/tests/show-dependencies.setup index 924a626b..76711987 100755 --- a/tests/show-dependencies.setup +++ b/tests/show-dependencies.setup @@ -198,7 +198,11 @@ cat <<EOF > xfce-core.morph "name": "xfce-core", "kind": "stratum", "build-depends": [ - "gtk-stack" + { + "morph": "gtk-stack", + "repo": "test:test-repo", + "ref": "master" + } ], "chunks": [ { |