From 4e37fdf5adbf4d25561b472b4089b6782c599f93 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 11 Sep 2012 18:05:56 +0100
Subject: Don't require .morph in triplet arguments

This gives us consistency with morphologies, where the triplets are
repo|ref|morphology, not repo|ref|filename

Anyone who runs 'morph build baserock:morphs master system.morph' will
now see an error ending with 'was looking for system.morph.morph', which
should make it clear where they have gone wrong.
---
 tests.as-root/archless-system-fails.script                   | 2 +-
 tests.as-root/disk-builds-rootfs-and-kernel.script           | 2 +-
 tests.as-root/make-patch.script                              | 4 ++--
 tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script | 2 +-
 tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script  | 2 +-
 tests.as-root/syslinux-fails-if-no-mbr-found.script          | 2 +-
 tests.as-root/system-overlap.script                          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'tests.as-root')

diff --git a/tests.as-root/archless-system-fails.script b/tests.as-root/archless-system-fails.script
index 9eaa41ba..5006c061 100755
--- a/tests.as-root/archless-system-fails.script
+++ b/tests.as-root/archless-system-fails.script
@@ -43,4 +43,4 @@ git add archless-system.morph
 git commit --quiet -m "add archless system"
 
 "$SRCDIR/scripts/test-morph" \
-    build-morphology test:morphs-repo archless archless-system.morph
+    build-morphology test:morphs-repo archless archless-system
diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script b/tests.as-root/disk-builds-rootfs-and-kernel.script
index 5b4f5d78..f9748ca9 100755
--- a/tests.as-root/disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/disk-builds-rootfs-and-kernel.script
@@ -84,7 +84,7 @@ git add linux.morph
 git commit --quiet -m 'Make the kernel create a dummy zImage'
 
 "$SRCDIR/scripts/test-morph" \
-    build-morphology test:morphs-repo custom system.morph > /dev/null
+    build-morphology test:morphs-repo custom system > /dev/null
 
 for suffix in kernel rootfs
 do
diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script
index 1578a768..de1ce172 100755
--- a/tests.as-root/make-patch.script
+++ b/tests.as-root/make-patch.script
@@ -45,7 +45,7 @@ EOF
 
 # Build first image. Remember the stratum.
 "$SRCDIR/scripts/test-morph" build-morphology \
-    test:morphs-repo master hello-system.morph
+    test:morphs-repo master hello-system
 img1=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*-rootfs')
 
 # Modify the chunk, in a new branch.
@@ -65,7 +65,7 @@ sed -i 's/master/alfred/' "$DATADIR/morphs-repo/hello-system.morph"
 
 # Build second image.
 "$SRCDIR/scripts/test-morph" build-morphology \
-    test:morphs-repo alfred hello-system.morph
+    test:morphs-repo alfred hello-system
 img2=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*' \
             ! -name $(basename "$img1"))
 
diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
index 803ffe53..c20efff5 100755
--- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
+++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
@@ -85,7 +85,7 @@ git add linux.morph
 git commit --quiet -m 'Make the kernel create a dummy zImage'
 
 "$SRCDIR/scripts/test-morph" \
-    build-morphology test:morphs-repo custom system.morph > /dev/null
+    build-morphology test:morphs-repo custom system > /dev/null
 
 for suffix in kernel rootfs
 do
diff --git a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
index 3cf39a51..f996aaa4 100755
--- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
@@ -91,7 +91,7 @@ git add linux.morph
 git commit --quiet -m 'Make the kernel create a dummy zImage'
 
 "$SRCDIR/scripts/test-morph" \
-    build-morphology test:morphs-repo custom system.morph > /dev/null
+    build-morphology test:morphs-repo custom system > /dev/null
 
 for suffix in kernel rootfs
 do
diff --git a/tests.as-root/syslinux-fails-if-no-mbr-found.script b/tests.as-root/syslinux-fails-if-no-mbr-found.script
index 4a23669d..ea1d135d 100755
--- a/tests.as-root/syslinux-fails-if-no-mbr-found.script
+++ b/tests.as-root/syslinux-fails-if-no-mbr-found.script
@@ -91,4 +91,4 @@ git add linux.morph
 git commit --quiet -m 'Make the kernel create a dummy zImage'
 
 "$SRCDIR/scripts/test-morph" --syslinux-mbr-search-path=nosuchfile.bin \
-    build-morphology test:morphs-repo custom system.morph > /dev/null
+    build-morphology test:morphs-repo custom system > /dev/null
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index 6911187e..5e995062 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -132,7 +132,7 @@ git add overlap-*.morph
 git commit --quiet -m 'Add overlapping chunks'
 
 "$SRCDIR/scripts/test-morph" \
-    build-morphology test:morphs-repo overlap overlap-system.morph > /dev/null
+    build-morphology test:morphs-repo overlap overlap-system > /dev/null
 "$SRCDIR/scripts/list-overlaps" groups \
     "$cache"/*.system.overlap-system*.overlaps |
 while IFS='\n' read overlaps; do
-- 
cgit v1.2.1