| Message ID | 20220209101530.3442837-3-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Improve integration of iotests in the meson test harness | expand |
Am 09.02.2022 um 11:15 hat Thomas Huth geschrieben: > Instead of failing the iotests if GNU sed is not available (or skipping > them completely in the check-block.sh script), it would be better to > simply skip the bash-based tests, so that the python-based tests could > still be run. Thus add the check for BusyBox sed to common.rc and mark > the tests as "not run" if GNU sed is not available. Then we can also > remove the sed checks from the check-block.sh script. > > Signed-off-by: Thomas Huth <thuth@redhat.com> I agree that skipping bash tests is slightly better than skipping all tests. And that the skipping should really be done in qemu-iotests itself and not in a wrapper around it. But can't we make it even better and skip only bash tests that actually use sed? > +# We need GNU sed for the iotests. Make sure to not use BusyBox sed > +# which says that "This is not GNU sed version 4.0" > SED= > for sed in sed gsed; do > - ($sed --version | grep 'GNU sed') > /dev/null 2>&1 > + ($sed --version | grep -v "not GNU sed" | grep 'GNU sed') > /dev/null 2>&1 > if [ "$?" -eq 0 ]; then > SED=$sed > break > fi > done > if [ -z "$SED" ]; then > - echo "$0: GNU sed not found" > - exit 1 > + _notrun "GNU sed not found" > fi Couldn't we just define 'sed' as a function or alias here that skips the test with _notrun only when it's actually called? Kevin
diff --git a/tests/check-block.sh b/tests/check-block.sh index 720a46bc36..af0c574812 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -52,18 +52,6 @@ if LANG=C bash --version | grep -q 'GNU bash, version [123]' ; then skip "bash version too old ==> Not running the qemu-iotests." fi -if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then - if ! command -v gsed >/dev/null 2>&1; then - skip "GNU sed not available ==> Not running the qemu-iotests." - fi -else - # Double-check that we're not using BusyBox' sed which says - # that "This is not GNU sed version 4.0" ... - if sed --version | grep -q 'not GNU sed' ; then - skip "BusyBox sed not supported ==> Not running the qemu-iotests." - fi -fi - cd tests/qemu-iotests # QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 9885030b43..9ea504810c 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -17,17 +17,27 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +# bail out, setting up .notrun file +_notrun() +{ + echo "$*" >"$OUTPUT_DIR/$seq.notrun" + echo "$seq not run: $*" + status=0 + exit +} + +# We need GNU sed for the iotests. Make sure to not use BusyBox sed +# which says that "This is not GNU sed version 4.0" SED= for sed in sed gsed; do - ($sed --version | grep 'GNU sed') > /dev/null 2>&1 + ($sed --version | grep -v "not GNU sed" | grep 'GNU sed') > /dev/null 2>&1 if [ "$?" -eq 0 ]; then SED=$sed break fi done if [ -z "$SED" ]; then - echo "$0: GNU sed not found" - exit 1 + _notrun "GNU sed not found" fi dd() @@ -722,16 +732,6 @@ _img_info() done } -# bail out, setting up .notrun file -# -_notrun() -{ - echo "$*" >"$OUTPUT_DIR/$seq.notrun" - echo "$seq not run: $*" - status=0 - exit -} - # bail out, setting up .casenotrun file # The function _casenotrun() is used as a notifier. It is the # caller's responsibility to make skipped a particular test.
Instead of failing the iotests if GNU sed is not available (or skipping them completely in the check-block.sh script), it would be better to simply skip the bash-based tests, so that the python-based tests could still be run. Thus add the check for BusyBox sed to common.rc and mark the tests as "not run" if GNU sed is not available. Then we can also remove the sed checks from the check-block.sh script. Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/check-block.sh | 12 ------------ tests/qemu-iotests/common.rc | 26 +++++++++++++------------- 2 files changed, 13 insertions(+), 25 deletions(-)