From 0d474d29c58f36085d3dfdfc22524e0870527e00 Mon Sep 17 00:00:00 2001 From: James Clarke Date: Thu, 14 Jul 2016 09:02:24 +0100 Subject: tests: Fix fdisk/id and fdisk/mbr-nondos-mode on Sparc On Sparc, fdisk defaults to using SUN disk labels, which causes the output from these tests to differ from non-Sparc. Signed-off-by: James Clarke --- tests/ts/fdisk/mbr-nondos-mode | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'tests/ts/fdisk/mbr-nondos-mode') diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode index e01b060f3..7ac5dae1b 100755 --- a/tests/ts/fdisk/mbr-nondos-mode +++ b/tests/ts/fdisk/mbr-nondos-mode @@ -37,6 +37,19 @@ 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 +ARCH=$(uname -m) +case $ARCH in + *sparc* ) + ARCH_EXT=".sparc" + ;; + *) + 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 -- cgit v1.2.3-55-g7522