diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-04-23 14:50:11 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-04-23 15:20:08 +0100 |
| commit | e421f9037f21454f39d67098edfead74b4e2a2ff (patch) | |
| tree | 9b09e9c59e9bfd23794d4a7a18f6fc0ae38c959b /tests.merging | |
| parent | e7e90384da00a8197c5e0363a5a4005754a790eb (diff) | |
| download | morph-e421f9037f21454f39d67098edfead74b4e2a2ff.tar.gz | |
Fix tests to use rootfs-tarball system-kinds, instead of disks
Diffstat (limited to 'tests.merging')
| -rw-r--r-- | tests.merging/rename-stratum.stderr | 2 | ||||
| -rwxr-xr-x | tests.merging/setup | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests.merging/rename-stratum.stderr b/tests.merging/rename-stratum.stderr index 760501fc..8ffed439 100644 --- a/tests.merging/rename-stratum.stderr +++ b/tests.merging/rename-stratum.stderr @@ -1 +1 @@ -ERROR: goodbye-stratum.morph was not found in TMP/workspace/master/test:morphs at ref 48d38ef3f39857d7dba4ed1ffc51653c6bed4906 +ERROR: goodbye-stratum.morph was not found in TMP/workspace/master/test:morphs at ref 9d4b0981d6a2118cbd3d045cc1704b224d38296f diff --git a/tests.merging/setup b/tests.merging/setup index 1fa5b8e3..c18a5ac6 100755 --- a/tests.merging/setup +++ b/tests.merging/setup @@ -51,7 +51,7 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph" { "name": "hello-system", "kind": "system", - "system-kind": "syslinux-disk", + "system-kind": "rootfs-tarball", "arch": "$(uname -m)", "disk-size": "1G", "strata": [ |