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 | |
| 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')
| -rwxr-xr-x | tests/show-dependencies.script | 4 | ||||
| -rwxr-xr-x | tests/show-dependencies.setup | 20 | ||||
| -rw-r--r-- | tests/show-dependencies.stdout | 4 |
3 files changed, 24 insertions, 4 deletions
diff --git a/tests/show-dependencies.script b/tests/show-dependencies.script index 056b81b2..15b69e25 100755 --- a/tests/show-dependencies.script +++ b/tests/show-dependencies.script @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,5 +21,5 @@ set -eu "$SRCDIR/scripts/test-morph" \ - show-dependencies test:test-repo master xfce-core | + show-dependencies test:test-repo master xfce-system | sed 's/test://' diff --git a/tests/show-dependencies.setup b/tests/show-dependencies.setup index e85c5ecf..5d70d821 100755 --- a/tests/show-dependencies.setup +++ b/tests/show-dependencies.setup @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -321,3 +321,21 @@ cat <<EOF > xfce-core.morph EOF git add xfce-core.morph git commit --quiet -m "add xfce-core.morph stratum" + +cat <<EOF > xfce-system.morph +{ + "name": "xfce-system", + "kind": "system", + "system-kind": "rootfs-tarball", + "arch": "$(uname -m)", + "strata": [ + { + "repo": "test:test-repo", + "ref": "master", + "morph": "xfce-core" + } + ] +} +EOF +git add xfce-system.morph +git commit --quiet -m "add xfce-system" diff --git a/tests/show-dependencies.stdout b/tests/show-dependencies.stdout index 84ed3ba6..ab1453db 100644 --- a/tests/show-dependencies.stdout +++ b/tests/show-dependencies.stdout @@ -1,4 +1,6 @@ -dependency graph for test-repo|master|xfce-core: +dependency graph for test-repo|master|xfce-system: + test-repo|master|xfce-system|xfce-system-rootfs + -> test-repo|master|xfce-core|xfce-core test-repo|master|xfce-core|xfce-core -> test-repo|master|exo|exo -> test-repo|master|garcon|garcon |