summaryrefslogtreecommitdiff
path: root/tests.as-root
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-02-12 16:18:45 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-02-13 15:39:37 +0000
commit2c9ad8890860f47d03433405c57f33f514fcd456 (patch)
tree9c7f2e04f1ef474dea2fa1e644052bba90ef6afa /tests.as-root
parent4e50b8850f13bef14ec31710c31801330e41cc32 (diff)
downloadmorph-2c9ad8890860f47d03433405c57f33f514fcd456.tar.gz
Don't use repo or ref in test suite
Diffstat (limited to 'tests.as-root')
-rwxr-xr-xtests.as-root/metadata-includes-morph-version.setup6
-rwxr-xr-xtests.as-root/metadata-includes-repo-alias.setup6
-rwxr-xr-xtests.as-root/setup14
-rwxr-xr-xtests.as-root/system-overlap.script6
-rwxr-xr-xtests.as-root/tarball-image-is-sensible.setup8
5 files changed, 5 insertions, 35 deletions
diff --git a/tests.as-root/metadata-includes-morph-version.setup b/tests.as-root/metadata-includes-morph-version.setup
index f0aefb3c..31829b01 100755
--- a/tests.as-root/metadata-includes-morph-version.setup
+++ b/tests.as-root/metadata-includes-morph-version.setup
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (C) 2013 Codethink Limited
+# Copyright (C) 2013-2014 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
@@ -31,13 +31,9 @@ cat <<EOF > hello-tarball.morph
"strata": [
{
"morph": "hello-stratum",
- "repo": "test:morphs",
- "ref": "master"
},
{
"morph": "linux-stratum",
- "repo": "test:morphs",
- "ref": "master"
}
]
}
diff --git a/tests.as-root/metadata-includes-repo-alias.setup b/tests.as-root/metadata-includes-repo-alias.setup
index f0aefb3c..31829b01 100755
--- a/tests.as-root/metadata-includes-repo-alias.setup
+++ b/tests.as-root/metadata-includes-repo-alias.setup
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (C) 2013 Codethink Limited
+# Copyright (C) 2013-2014 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
@@ -31,13 +31,9 @@ cat <<EOF > hello-tarball.morph
"strata": [
{
"morph": "hello-stratum",
- "repo": "test:morphs",
- "ref": "master"
},
{
"morph": "linux-stratum",
- "repo": "test:morphs",
- "ref": "master"
}
]
}
diff --git a/tests.as-root/setup b/tests.as-root/setup
index 2ab1cd94..b865f42d 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -10,7 +10,7 @@
# The stratum repository contains a single branch, "master", with a
# stratum and a system morphology that include the chunk above.
#
-# Copyright (C) 2011, 2012, 2013 Codethink Limited
+# Copyright (C) 2011, 2012, 2013, 2014 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
@@ -120,8 +120,6 @@ name: tools-stratum
kind: stratum
build-depends:
- morph: linux-stratum
- repo: test:morphs
- ref: master
chunks:
- name: tools
repo: test:tools-repo
@@ -137,8 +135,6 @@ kind: system
arch: `uname -m`
strata:
- morph: hello-stratum
- repo: test:morphs
- ref: master
EOF
git add hello-system.morph
@@ -147,8 +143,6 @@ name: linux-stratum
kind: stratum
build-depends:
- morph: hello-stratum
- repo: test:morphs
- ref: master
chunks:
- name: linux
repo: test:kernel-repo
@@ -164,14 +158,8 @@ kind: system
arch: `uname -m`
strata:
- morph: hello-stratum
- repo: test:morphs
- ref: master
- morph: linux-stratum
- repo: test:morphs
- ref: master
- morph: tools-stratum
- repo: test:morphs
- ref: master
EOF
git add linux-system.morph
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index 41ff7536..c6154e0e 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2011-2013 Codethink Limited
+# Copyright (C) 2011-2014 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
@@ -35,13 +35,9 @@ cat <<EOF >overlap-system.morph
"strata": [
{
"morph": "foo-baz-stratum",
- "repo": "test:morphs",
- "ref": "overlap"
},
{
"morph": "foo-barqux-stratum",
- "repo": "test:morphs",
- "ref": "overlap"
}
]
}
diff --git a/tests.as-root/tarball-image-is-sensible.setup b/tests.as-root/tarball-image-is-sensible.setup
index 5fd7b283..505707b3 100755
--- a/tests.as-root/tarball-image-is-sensible.setup
+++ b/tests.as-root/tarball-image-is-sensible.setup
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (C) 2011-2013 Codethink Limited
+# Copyright (C) 2011-2014 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
@@ -50,18 +50,12 @@ cat <<EOF > hello-tarball.morph
"strata": [
{
"morph": "link-stratum",
- "repo": "test:morphs",
- "ref": "tarball-links"
},
{
"morph": "hello-stratum",
- "repo": "test:morphs",
- "ref": "tarball-links"
},
{
"morph": "linux-stratum",
- "repo": "test:morphs",
- "ref": "tarball-links"
}
]
}