diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-22 10:38:29 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-22 10:54:29 +0000 |
| commit | f3aa715cf5e9ba09c44f2c1aa2c99ecd51d2a168 (patch) | |
| tree | d12ecd0501934128a882dd1e0213f5fe5fb29cb9 /tests.build | |
| parent | cd50ad396208af9bb5fe65945c0771673645ecca (diff) | |
| download | morph-f3aa715cf5e9ba09c44f2c1aa2c99ecd51d2a168.tar.gz | |
Allow building strata with 'morph build-morphology' again
This is mainly to fix bootstrap.
Diffstat (limited to 'tests.build')
| -rwxr-xr-x | tests.build/no-isolated-chunk-builds.script (renamed from tests.build/only-build-systems.script) | 10 | ||||
| -rw-r--r-- | tests.build/no-isolated-chunk-builds.stderr | 1 | ||||
| -rw-r--r-- | tests.build/only-build-systems.stderr | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/tests.build/only-build-systems.script b/tests.build/no-isolated-chunk-builds.script index 635a218f..07e33479 100755 --- a/tests.build/only-build-systems.script +++ b/tests.build/no-isolated-chunk-builds.script @@ -16,14 +16,14 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -## Morph should refuse build a chunk or a stratum out of the context. Only -## system morphologies can be built. +## 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 || true + test:morphs-repo master hello-stratum -"$SRCDIR/scripts/test-morph" build-morphology \ - test:chunk-repo farrokh hello || true +! "$SRCDIR/scripts/test-morph" build-morphology \ + test:chunk-repo farrokh hello diff --git a/tests.build/no-isolated-chunk-builds.stderr b/tests.build/no-isolated-chunk-builds.stderr new file mode 100644 index 00000000..502ce9a6 --- /dev/null +++ b/tests.build/no-isolated-chunk-builds.stderr @@ -0,0 +1 @@ +ERROR: Building a chunk directly is not supported diff --git a/tests.build/only-build-systems.stderr b/tests.build/only-build-systems.stderr deleted file mode 100644 index ba7339d2..00000000 --- a/tests.build/only-build-systems.stderr +++ /dev/null @@ -1,2 +0,0 @@ -ERROR: Building a stratum directly is not supported -ERROR: Building a chunk directly is not supported |