diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-07-23 17:14:28 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-07-23 16:43:17 +0000 |
| commit | 1ae4b3d77bdf7f666c7817346baf08129a6247f3 (patch) | |
| tree | 0e7fb3cd057bc3f7b971a79dad897d1205945e32 /tests.build | |
| parent | 79eb63a0669842e2d8eff43f42683ed9ce28383a (diff) | |
| download | morph-1ae4b3d77bdf7f666c7817346baf08129a6247f3.tar.gz | |
Remove support for Baserock definitions format versions 0, 1 and 2
The previous release of the Baserock reference systems (baserock-15.25
tag) used Baserock definitions version 3, so this version of Morph can
still build the last release of the Baserock reference systems.
In the course of fixing up the cmdtest tests to use version 5
definitions, I removed a couple of bits of redundant code.
Change-Id: If9d480aa966d2ea5939cf04351f3d488cccea67f
Diffstat (limited to 'tests.build')
| -rwxr-xr-x | tests.build/only-build-systems.script | 28 | ||||
| -rw-r--r-- | tests.build/only-build-systems.stderr | 2 | ||||
| -rwxr-xr-x | tests.build/setup | 3 |
3 files changed, 3 insertions, 30 deletions
diff --git a/tests.build/only-build-systems.script b/tests.build/only-build-systems.script deleted file mode 100755 index ae664f7e..00000000 --- a/tests.build/only-build-systems.script +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2013,2015 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see <http://www.gnu.org/licenses/>. - - -## Morph should refuse build a chunk out of the context. Only -## system and stratum morphologies can be built. - -set -eu - -! "$SRCDIR/scripts/test-morph" build-morphology \ - test:morphs-repo master hello-stratum - -! "$SRCDIR/scripts/test-morph" build-morphology \ - test:chunk-repo farrokh hello - diff --git a/tests.build/only-build-systems.stderr b/tests.build/only-build-systems.stderr deleted file mode 100644 index ac24ab25..00000000 --- a/tests.build/only-build-systems.stderr +++ /dev/null @@ -1,2 +0,0 @@ -ERROR: In order to build this stratum directly, please give the filename of the system which contains it, and the name of the stratum. See `morph build --help` for more information. -ERROR: In order to build this chunk directly, please give the filename of the system which contains it, and the name of the chunk. See `morph build --help` for more information. diff --git a/tests.build/setup b/tests.build/setup index 4663ff1d..b7dc5074 100755 --- a/tests.build/setup +++ b/tests.build/setup @@ -81,6 +81,9 @@ mkdir "$morphsrepo" cd "$morphsrepo" git init --quiet +echo 'version: 5' > VERSION +git add VERSION + cat <<EOF > hello-stratum.morph name: hello-stratum kind: stratum |