From c7fb0cb861104e99c11e8b4e031d981dab7891a1 Mon Sep 17 00:00:00 2001 From: Alasdair G Kergon Date: Thu, 20 Apr 2017 20:05:07 +0100 Subject: [PATCH] test: Skip some reshape tests that hang on single core machines Skip hanging raid reshape tests until https://bugzilla.redhat.com/1443999 is fixed --- test/lib/aux.sh | 5 +++++ test/shell/lvconvert-raid-reshape-linear_to_striped.sh | 4 ++++ test/shell/lvconvert-raid-reshape-striped_to_linear.sh | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 5303adcec..b05c59db2 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -1490,6 +1490,11 @@ have_readline() { echo version | lvm &>/dev/null } +have_single_core() { + which nproc &>/dev/null || return 0 + [ $(nproc) -eq 1 ] && return 1 +} + dmsetup_wrapped() { udev_wait dmsetup "$@" diff --git a/test/shell/lvconvert-raid-reshape-linear_to_striped.sh b/test/shell/lvconvert-raid-reshape-linear_to_striped.sh index 29a293e62..13769ec05 100644 --- a/test/shell/lvconvert-raid-reshape-linear_to_striped.sh +++ b/test/shell/lvconvert-raid-reshape-linear_to_striped.sh @@ -17,6 +17,10 @@ SKIP_WITH_LVMPOLLD=1 which mkfs.ext4 || skip aux have_raid 1 10 1 || skip +# Temporarily skip reshape tests on single-core CPUs until there's a fix for +# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20 +aux have_single_core || skip + aux prepare_vg 5 # diff --git a/test/shell/lvconvert-raid-reshape-striped_to_linear.sh b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh index 357763ee7..8f53a42f8 100644 --- a/test/shell/lvconvert-raid-reshape-striped_to_linear.sh +++ b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh @@ -17,6 +17,10 @@ SKIP_WITH_LVMPOLLD=1 which mkfs.ext4 || skip aux have_raid 1 10 1 || skip +# Temporarily skip reshape tests on single-core CPUs until there's a fix for +# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20 +aux have_single_core || skip + aux prepare_vg 5 #