diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-15 10:51:25 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-15 10:51:25 +0000 |
| commit | 8046bf0aa9e3258be6ed79dc529ac6373c37c2d7 (patch) | |
| tree | 597d69de79831696f879c52fa580733ecd0175e6 /tests.as-root/system-overlap.script | |
| parent | 1f06e41bfe51b8b9263135902ab5d990541b8cb0 (diff) | |
| parent | d2eb452ee48253d6e90f7aa4f6c41b6fd8cdf009 (diff) | |
| download | morph-8046bf0aa9e3258be6ed79dc529ac6373c37c2d7.tar.gz | |
Merge branch 'samthursfield/build-essential-2-rebase'
Conflicts:
morphlib/bins_tests.py
Reviewed-By: consensus
Diffstat (limited to 'tests.as-root/system-overlap.script')
| -rwxr-xr-x | tests.as-root/system-overlap.script | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script index cc308536..b8888491 100755 --- a/tests.as-root/system-overlap.script +++ b/tests.as-root/system-overlap.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2011, 2012 Codethink Limited +# Copyright (C) 2011-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 @@ -57,12 +57,14 @@ cat <<EOF >foo-baz-stratum.morph "name": "overlap-foo-baz", "repo": "test:chunk-repo", "ref": "overlap", + "build-mode": "test", "build-depends": [] }, { "name": "linux", "repo": "test:kernel-repo", "ref": "master", + "build-mode": "test", "build-depends": ["overlap-foo-baz"] } ] @@ -77,12 +79,14 @@ cat <<EOF >foo-barqux-stratum.morph "name": "overlap-foobar", "repo": "test:chunk-repo", "ref": "overlap", + "build-mode": "test", "build-depends": [] }, { "name": "overlap-fooqux", "repo": "test:chunk-repo", "ref": "overlap", + "build-mode": "test", "build-depends": ["overlap-foobar"] } ] |