From 2ce8a926e858c06f76c7875dbd28616613f541dc Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Thu, 31 Jan 2013 12:20:11 +0000 Subject: 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. --- tests/show-dependencies.script | 4 ++-- tests/show-dependencies.setup | 20 +++++++++++++++++++- tests/show-dependencies.stdout | 4 +++- 3 files changed, 24 insertions(+), 4 deletions(-) (limited to 'tests') 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 < xfce-core.morph EOF git add xfce-core.morph git commit --quiet -m "add xfce-core.morph stratum" + +cat < 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 -- cgit v1.2.1