summaryrefslogtreecommitdiff
path: root/tests.as-root
diff options
context:
space:
mode:
Diffstat (limited to 'tests.as-root')
-rwxr-xr-xtests.as-root/archless-system-fails.script2
-rwxr-xr-xtests.as-root/disk-builds-rootfs-and-kernel.script2
-rwxr-xr-xtests.as-root/make-patch.script6
-rwxr-xr-xtests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script2
-rwxr-xr-xtests.as-root/syslinux-disk-builds-rootfs-and-kernel.script2
-rwxr-xr-xtests.as-root/syslinux-fails-if-no-mbr-found.script2
-rwxr-xr-xtests.as-root/system-overlap.script2
7 files changed, 10 insertions, 8 deletions
diff --git a/tests.as-root/archless-system-fails.script b/tests.as-root/archless-system-fails.script
index 02372b5b..9eaa41ba 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 test:morphs-repo archless archless-system.morph
+ build-morphology test:morphs-repo archless archless-system.morph
diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script b/tests.as-root/disk-builds-rootfs-and-kernel.script
index 475df6c1..5b4f5d78 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 test:morphs-repo custom system.morph > /dev/null
+ build-morphology test:morphs-repo custom system.morph > /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 5204fce1..1578a768 100755
--- a/tests.as-root/make-patch.script
+++ b/tests.as-root/make-patch.script
@@ -44,7 +44,8 @@ EOF
> /dev/null
# Build first image. Remember the stratum.
-"$SRCDIR/scripts/test-morph" build test:morphs-repo master hello-system.morph
+"$SRCDIR/scripts/test-morph" build-morphology \
+ test:morphs-repo master hello-system.morph
img1=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*-rootfs')
# Modify the chunk, in a new branch.
@@ -63,7 +64,8 @@ sed -i 's/master/alfred/' "$DATADIR/morphs-repo/hello-system.morph"
> /dev/null
# Build second image.
-"$SRCDIR/scripts/test-morph" build test:morphs-repo alfred hello-system.morph
+"$SRCDIR/scripts/test-morph" build-morphology \
+ test:morphs-repo alfred hello-system.morph
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 c9bd418c..803ffe53 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 test:morphs-repo custom system.morph > /dev/null
+ build-morphology test:morphs-repo custom system.morph > /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 6a968563..3cf39a51 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 test:morphs-repo custom system.morph > /dev/null
+ build-morphology test:morphs-repo custom system.morph > /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 bb5f28cb..4a23669d 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 test:morphs-repo custom system.morph > /dev/null
+ build-morphology test:morphs-repo custom system.morph > /dev/null
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index c7e6969a..6911187e 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 test:morphs-repo overlap overlap-system.morph > /dev/null
+ build-morphology test:morphs-repo overlap overlap-system.morph > /dev/null
"$SRCDIR/scripts/list-overlaps" groups \
"$cache"/*.system.overlap-system*.overlaps |
while IFS='\n' read overlaps; do