diff options
| author | Manuel Bentele | 2019-08-21 14:58:42 +0200 |
|---|---|---|
| committer | Manuel Bentele | 2019-08-21 14:58:42 +0200 |
| commit | 0692b963aa3cb846d8abab5ef5247c4dbb3fec96 (patch) | |
| tree | f13776d25da3e1adc1445aef22e7566ac98cbe84 /tests/ts/fdisk/mbr-nondos-mode | |
| parent | losetup: added file format option to the man page (diff) | |
| parent | partx: document -d vs. --nr and fix test (diff) | |
| download | kernel-qcow2-util-linux-0692b963aa3cb846d8abab5ef5247c4dbb3fec96.tar.gz kernel-qcow2-util-linux-0692b963aa3cb846d8abab5ef5247c4dbb3fec96.tar.xz kernel-qcow2-util-linux-0692b963aa3cb846d8abab5ef5247c4dbb3fec96.zip | |
lib/losetup: merge remote-tracking branch 'util-linux/master'kernel-qcow2
Signed-off-by: Manuel Bentele <development@manuel-bentele.de>
Diffstat (limited to 'tests/ts/fdisk/mbr-nondos-mode')
| -rwxr-xr-x | tests/ts/fdisk/mbr-nondos-mode | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode index d3b35fa39..8fb09f1ce 100755 --- a/tests/ts/fdisk/mbr-nondos-mode +++ b/tests/ts/fdisk/mbr-nondos-mode @@ -37,19 +37,16 @@ FDISK_CMD_DELETE_1PRIMARY="d\n1\n" # delete first primary FDISK_CMD_DELETE_2PRIMARY="d\n2\n" # delete first primary FDISK_CMD_DELETE_EXTENDED="d\n3\n" # delete second primary -# Sparc uses SUN disk labels by default and thus has a different output +# ignore architectures where MBR is not a default ARCH=$(uname -m) case $ARCH in *sparc* ) - ARCH_EXT=".sparc" + ts_skip "unsupported" ;; *) - ARCH_EXT="" ;; esac -TS_EXPECTED+="${ARCH_EXT}" - function print_layout { echo -ne "\n---layout----------\n" >> $TS_OUTPUT $TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT |