diff options
Diffstat (limited to 'main/parted/skip-duplicate-bsd-test-on-s390x.patch')
| -rw-r--r-- | main/parted/skip-duplicate-bsd-test-on-s390x.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/main/parted/skip-duplicate-bsd-test-on-s390x.patch b/main/parted/skip-duplicate-bsd-test-on-s390x.patch index 6920ee2c9a2..f938e5b874b 100644 --- a/main/parted/skip-duplicate-bsd-test-on-s390x.patch +++ b/main/parted/skip-duplicate-bsd-test-on-s390x.patch @@ -1,16 +1,16 @@ -diff --git a/tests/t0501-duplicate.sh b/tests/t0501-duplicate.sh -index 66d321a..0520131 100644 --- a/tests/t0501-duplicate.sh +++ b/tests/t0501-duplicate.sh -@@ -18,7 +18,11 @@ +@@ -18,9 +18,13 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../parted . +arch=$(uname -m) - for t in msdos gpt bsd; do -+ if [ "$t" = bsd ] && [ "$arch" = "s390x" ]; then -+ continue -+ fi - duplicate $t || fail=1 - done - + for t in msdos gpt bsd sun atari mac pc98; do + case $t in + atari) [ $ss -ne 512 ] && continue ++ ;; ++ bsd) [ "$arch" = "s390x" ] && continue ++ duplicate $t || fail=1 + ;; + *) duplicate $t || fail=1 + ;; |