[Qemu-devel] [PATCH 0/6] tests/qemu-iotests: Run basic iotests during "make check"

[Qemu-devel] [PATCH 0/6] tests/qemu-iotests: Run basic iotests during "make check"

[Thomas Huth]

People often forget to run the iotests before submitting patches or
pull requests - this is likely due to the fact that we do not run the
tests during our mandatory "make check" tests yet.
This patch series now introduces a new "ci" iotests group that should
be safe to run in all CI environments (including FreeBSD and macOS!).
Thus these iotests can now always be run during "make check" automati-
cally, too.

Thomas Huth (6):
  tests/qemu-iotests/check: Pick a default machine if necessary
  tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines
  tests/qemu-iotests: Do not hard-code the path to bash
  cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
  tests: Run the iotests during "make check" again
  tests/qemu-iotests: Remove the "_supported_os Linux" line from many
    tests

 .cirrus.yml                 |   4 +-
 .travis.yml                 |   1 +
 tests/Makefile.include      |   2 +-
 tests/qemu-iotests-quick.sh |  17 +++-
 tests/qemu-iotests/001      |   1 -
 tests/qemu-iotests/002      |   1 -
 tests/qemu-iotests/003      |   1 -
 tests/qemu-iotests/004      |   1 -
 tests/qemu-iotests/005      |   1 -
 tests/qemu-iotests/007      |   1 -
 tests/qemu-iotests/008      |   1 -
 tests/qemu-iotests/009      |   1 -
 tests/qemu-iotests/010      |   1 -
 tests/qemu-iotests/011      |   1 -
 tests/qemu-iotests/012      |   1 -
 tests/qemu-iotests/013      |   1 -
 tests/qemu-iotests/014      |   1 -
 tests/qemu-iotests/015      |   1 -
 tests/qemu-iotests/017      |   1 -
 tests/qemu-iotests/020      |   1 -
 tests/qemu-iotests/021      |   1 -
 tests/qemu-iotests/022      |   1 -
 tests/qemu-iotests/023      |   1 -
 tests/qemu-iotests/025      |   1 -
 tests/qemu-iotests/026      |   1 -
 tests/qemu-iotests/027      |   1 -
 tests/qemu-iotests/028      |   1 -
 tests/qemu-iotests/029      |   1 -
 tests/qemu-iotests/031      |   1 -
 tests/qemu-iotests/032      |   1 -
 tests/qemu-iotests/033      |   1 -
 tests/qemu-iotests/035      |   1 -
 tests/qemu-iotests/036      |   1 -
 tests/qemu-iotests/037      |   1 -
 tests/qemu-iotests/042      |   1 -
 tests/qemu-iotests/043      |   1 -
 tests/qemu-iotests/046      |   1 -
 tests/qemu-iotests/047      |   1 -
 tests/qemu-iotests/049      |   1 -
 tests/qemu-iotests/050      |   1 -
 tests/qemu-iotests/051      |   1 -
 tests/qemu-iotests/052      |   1 -
 tests/qemu-iotests/053      |   1 -
 tests/qemu-iotests/054      |   1 -
 tests/qemu-iotests/060      |   1 -
 tests/qemu-iotests/061      |   1 -
 tests/qemu-iotests/062      |   1 -
 tests/qemu-iotests/063      |   1 -
 tests/qemu-iotests/066      |   1 -
 tests/qemu-iotests/067      |   1 -
 tests/qemu-iotests/068      |   1 -
 tests/qemu-iotests/069      |   1 -
 tests/qemu-iotests/071      |   1 -
 tests/qemu-iotests/072      |   1 -
 tests/qemu-iotests/073      |   1 -
 tests/qemu-iotests/079      |   1 -
 tests/qemu-iotests/080      |   1 -
 tests/qemu-iotests/082      |   1 -
 tests/qemu-iotests/085      |   1 -
 tests/qemu-iotests/089      |   1 -
 tests/qemu-iotests/090      |   1 -
 tests/qemu-iotests/091      |   1 -
 tests/qemu-iotests/094      |   1 -
 tests/qemu-iotests/095      |   1 -
 tests/qemu-iotests/097      |   1 -
 tests/qemu-iotests/098      |   1 -
 tests/qemu-iotests/102      |   1 -
 tests/qemu-iotests/103      |   1 -
 tests/qemu-iotests/104      |   1 -
 tests/qemu-iotests/105      |   1 -
 tests/qemu-iotests/107      |   1 -
 tests/qemu-iotests/110      |   1 -
 tests/qemu-iotests/111      |   1 -
 tests/qemu-iotests/112      |   1 -
 tests/qemu-iotests/114      |   1 -
 tests/qemu-iotests/115      |   1 -
 tests/qemu-iotests/117      |   1 -
 tests/qemu-iotests/120      |   1 -
 tests/qemu-iotests/121      |   1 -
 tests/qemu-iotests/122      |   1 -
 tests/qemu-iotests/125      |   1 -
 tests/qemu-iotests/126      |   1 -
 tests/qemu-iotests/127      |   1 -
 tests/qemu-iotests/130      |   1 -
 tests/qemu-iotests/133      |   1 -
 tests/qemu-iotests/134      |   1 -
 tests/qemu-iotests/137      |   1 -
 tests/qemu-iotests/138      |   1 -
 tests/qemu-iotests/141      |   1 -
 tests/qemu-iotests/142      |   1 -
 tests/qemu-iotests/143      |   1 -
 tests/qemu-iotests/144      |   1 -
 tests/qemu-iotests/145      |   1 -
 tests/qemu-iotests/153      |   1 -
 tests/qemu-iotests/156      |   1 -
 tests/qemu-iotests/157      |   1 -
 tests/qemu-iotests/158      |   1 -
 tests/qemu-iotests/159      |   1 -
 tests/qemu-iotests/161      |   1 -
 tests/qemu-iotests/162      |   1 -
 tests/qemu-iotests/170      |   1 -
 tests/qemu-iotests/172      |   1 -
 tests/qemu-iotests/173      |   1 -
 tests/qemu-iotests/176      |   1 -
 tests/qemu-iotests/178      |   1 -
 tests/qemu-iotests/181      |   1 -
 tests/qemu-iotests/182      |   1 -
 tests/qemu-iotests/183      |   1 -
 tests/qemu-iotests/185      |   1 -
 tests/qemu-iotests/186      |   1 -
 tests/qemu-iotests/187      |   1 -
 tests/qemu-iotests/189      |   1 -
 tests/qemu-iotests/190      |   1 -
 tests/qemu-iotests/191      |   1 -
 tests/qemu-iotests/192      |   1 -
 tests/qemu-iotests/195      |   1 -
 tests/qemu-iotests/197      |   1 -
 tests/qemu-iotests/198      |   1 -
 tests/qemu-iotests/200      |   1 -
 tests/qemu-iotests/201      |   1 -
 tests/qemu-iotests/214      |   1 -
 tests/qemu-iotests/215      |   1 -
 tests/qemu-iotests/217      |   1 -
 tests/qemu-iotests/220      |   1 -
 tests/qemu-iotests/227      |   1 -
 tests/qemu-iotests/229      |   1 -
 tests/qemu-iotests/231      |   1 -
 tests/qemu-iotests/232      |   1 -
 tests/qemu-iotests/233      |   1 -
 tests/qemu-iotests/239      |   2 +-
 tests/qemu-iotests/240      |   3 +-
 tests/qemu-iotests/241      |   2 +-
 tests/qemu-iotests/243      |   2 +-
 tests/qemu-iotests/244      |   2 +-
 tests/qemu-iotests/247      |   1 -
 tests/qemu-iotests/check    |  13 ++-
 tests/qemu-iotests/group    | 194 +++++++++++++++++++-----------------
 137 files changed, 139 insertions(+), 229 deletions(-)

-- 
2.21.0

[Qemu-devel] [PATCH 0/6] tests/qemu-iotests: Run basic iotests during "make check"

[Thomas Huth]

People often forget to run the iotests before submitting patches or
pull requests - this is likely due to the fact that we do not run the
tests during our mandatory "make check" tests yet.
This patch series now introduces a new "ci" iotests group that should
be safe to run in all CI environments (including FreeBSD and macOS!).
Thus these iotests can now always be run during "make check" automati-
cally, too.

Thomas Huth (6):
  tests/qemu-iotests/check: Pick a default machine if necessary
  tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines
  tests/qemu-iotests: Do not hard-code the path to bash
  cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
  tests: Run the iotests during "make check" again
  tests/qemu-iotests: Remove the "_supported_os Linux" line from many
    tests

 .cirrus.yml                 |   4 +-
 .travis.yml                 |   1 +
 tests/Makefile.include      |   2 +-
 tests/qemu-iotests-quick.sh |  17 +++-
 tests/qemu-iotests/001      |   1 -
 tests/qemu-iotests/002      |   1 -
 tests/qemu-iotests/003      |   1 -
 tests/qemu-iotests/004      |   1 -
 tests/qemu-iotests/005      |   1 -
 tests/qemu-iotests/007      |   1 -
 tests/qemu-iotests/008      |   1 -
 tests/qemu-iotests/009      |   1 -
 tests/qemu-iotests/010      |   1 -
 tests/qemu-iotests/011      |   1 -
 tests/qemu-iotests/012      |   1 -
 tests/qemu-iotests/013      |   1 -
 tests/qemu-iotests/014      |   1 -
 tests/qemu-iotests/015      |   1 -
 tests/qemu-iotests/017      |   1 -
 tests/qemu-iotests/020      |   1 -
 tests/qemu-iotests/021      |   1 -
 tests/qemu-iotests/022      |   1 -
 tests/qemu-iotests/023      |   1 -
 tests/qemu-iotests/025      |   1 -
 tests/qemu-iotests/026      |   1 -
 tests/qemu-iotests/027      |   1 -
 tests/qemu-iotests/028      |   1 -
 tests/qemu-iotests/029      |   1 -
 tests/qemu-iotests/031      |   1 -
 tests/qemu-iotests/032      |   1 -
 tests/qemu-iotests/033      |   1 -
 tests/qemu-iotests/035      |   1 -
 tests/qemu-iotests/036      |   1 -
 tests/qemu-iotests/037      |   1 -
 tests/qemu-iotests/042      |   1 -
 tests/qemu-iotests/043      |   1 -
 tests/qemu-iotests/046      |   1 -
 tests/qemu-iotests/047      |   1 -
 tests/qemu-iotests/049      |   1 -
 tests/qemu-iotests/050      |   1 -
 tests/qemu-iotests/051      |   1 -
 tests/qemu-iotests/052      |   1 -
 tests/qemu-iotests/053      |   1 -
 tests/qemu-iotests/054      |   1 -
 tests/qemu-iotests/060      |   1 -
 tests/qemu-iotests/061      |   1 -
 tests/qemu-iotests/062      |   1 -
 tests/qemu-iotests/063      |   1 -
 tests/qemu-iotests/066      |   1 -
 tests/qemu-iotests/067      |   1 -
 tests/qemu-iotests/068      |   1 -
 tests/qemu-iotests/069      |   1 -
 tests/qemu-iotests/071      |   1 -
 tests/qemu-iotests/072      |   1 -
 tests/qemu-iotests/073      |   1 -
 tests/qemu-iotests/079      |   1 -
 tests/qemu-iotests/080      |   1 -
 tests/qemu-iotests/082      |   1 -
 tests/qemu-iotests/085      |   1 -
 tests/qemu-iotests/089      |   1 -
 tests/qemu-iotests/090      |   1 -
 tests/qemu-iotests/091      |   1 -
 tests/qemu-iotests/094      |   1 -
 tests/qemu-iotests/095      |   1 -
 tests/qemu-iotests/097      |   1 -
 tests/qemu-iotests/098      |   1 -
 tests/qemu-iotests/102      |   1 -
 tests/qemu-iotests/103      |   1 -
 tests/qemu-iotests/104      |   1 -
 tests/qemu-iotests/105      |   1 -
 tests/qemu-iotests/107      |   1 -
 tests/qemu-iotests/110      |   1 -
 tests/qemu-iotests/111      |   1 -
 tests/qemu-iotests/112      |   1 -
 tests/qemu-iotests/114      |   1 -
 tests/qemu-iotests/115      |   1 -
 tests/qemu-iotests/117      |   1 -
 tests/qemu-iotests/120      |   1 -
 tests/qemu-iotests/121      |   1 -
 tests/qemu-iotests/122      |   1 -
 tests/qemu-iotests/125      |   1 -
 tests/qemu-iotests/126      |   1 -
 tests/qemu-iotests/127      |   1 -
 tests/qemu-iotests/130      |   1 -
 tests/qemu-iotests/133      |   1 -
 tests/qemu-iotests/134      |   1 -
 tests/qemu-iotests/137      |   1 -
 tests/qemu-iotests/138      |   1 -
 tests/qemu-iotests/141      |   1 -
 tests/qemu-iotests/142      |   1 -
 tests/qemu-iotests/143      |   1 -
 tests/qemu-iotests/144      |   1 -
 tests/qemu-iotests/145      |   1 -
 tests/qemu-iotests/153      |   1 -
 tests/qemu-iotests/156      |   1 -
 tests/qemu-iotests/157      |   1 -
 tests/qemu-iotests/158      |   1 -
 tests/qemu-iotests/159      |   1 -
 tests/qemu-iotests/161      |   1 -
 tests/qemu-iotests/162      |   1 -
 tests/qemu-iotests/170      |   1 -
 tests/qemu-iotests/172      |   1 -
 tests/qemu-iotests/173      |   1 -
 tests/qemu-iotests/176      |   1 -
 tests/qemu-iotests/178      |   1 -
 tests/qemu-iotests/181      |   1 -
 tests/qemu-iotests/182      |   1 -
 tests/qemu-iotests/183      |   1 -
 tests/qemu-iotests/185      |   1 -
 tests/qemu-iotests/186      |   1 -
 tests/qemu-iotests/187      |   1 -
 tests/qemu-iotests/189      |   1 -
 tests/qemu-iotests/190      |   1 -
 tests/qemu-iotests/191      |   1 -
 tests/qemu-iotests/192      |   1 -
 tests/qemu-iotests/195      |   1 -
 tests/qemu-iotests/197      |   1 -
 tests/qemu-iotests/198      |   1 -
 tests/qemu-iotests/200      |   1 -
 tests/qemu-iotests/201      |   1 -
 tests/qemu-iotests/214      |   1 -
 tests/qemu-iotests/215      |   1 -
 tests/qemu-iotests/217      |   1 -
 tests/qemu-iotests/220      |   1 -
 tests/qemu-iotests/227      |   1 -
 tests/qemu-iotests/229      |   1 -
 tests/qemu-iotests/231      |   1 -
 tests/qemu-iotests/232      |   1 -
 tests/qemu-iotests/233      |   1 -
 tests/qemu-iotests/239      |   2 +-
 tests/qemu-iotests/240      |   3 +-
 tests/qemu-iotests/241      |   2 +-
 tests/qemu-iotests/243      |   2 +-
 tests/qemu-iotests/244      |   2 +-
 tests/qemu-iotests/247      |   1 -
 tests/qemu-iotests/check    |  13 ++-
 tests/qemu-iotests/group    | 194 +++++++++++++++++++-----------------
 137 files changed, 139 insertions(+), 229 deletions(-)

-- 
2.21.0

[Qemu-devel] [PATCH 1/6] tests/qemu-iotests/check: Pick a default machine if necessary

[Thomas Huth]

qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have
a default machine, so when running the qemu-iotests with such a binary,
lots of tests are failing. Fix it by picking a default machine in the
"check" script instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/check | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index f9c24b6753..922c5d1d3d 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -130,7 +130,6 @@ export CACHEMODE="writeback"
 export QEMU_IO_OPTIONS=""
 export QEMU_IO_OPTIONS_NO_FMT=""
 export CACHEMODE_IS_DEFAULT=true
-export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
 export VALGRIND_QEMU=
 export IMGKEYSECRET=
 export IMGOPTSSYNTAX=false
@@ -564,6 +563,18 @@ then
 fi
 export QEMU_PROG="$(type -p "$QEMU_PROG")"
 
+case "$QEMU_PROG" in
+    *qemu-system-arm|*qemu-system-aarch64)
+        export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest"
+        ;;
+    *qemu-system-tricore)
+        export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest"
+        ;;
+    *)
+        export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
+        ;;
+esac
+
 if [ -z "$QEMU_IMG_PROG" ]; then
     if [ -x "$build_iotests/qemu-img" ]; then
         export QEMU_IMG_PROG="$build_iotests/qemu-img"
-- 
2.21.0

[Qemu-devel] [PATCH 1/6] tests/qemu-iotests/check: Pick a default machine if necessary

[Thomas Huth]

qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have
a default machine, so when running the qemu-iotests with such a binary,
lots of tests are failing. Fix it by picking a default machine in the
"check" script instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/check | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index f9c24b6753..922c5d1d3d 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -130,7 +130,6 @@ export CACHEMODE="writeback"
 export QEMU_IO_OPTIONS=""
 export QEMU_IO_OPTIONS_NO_FMT=""
 export CACHEMODE_IS_DEFAULT=true
-export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
 export VALGRIND_QEMU=
 export IMGKEYSECRET=
 export IMGOPTSSYNTAX=false
@@ -564,6 +563,18 @@ then
 fi
 export QEMU_PROG="$(type -p "$QEMU_PROG")"
 
+case "$QEMU_PROG" in
+    *qemu-system-arm|*qemu-system-aarch64)
+        export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest"
+        ;;
+    *qemu-system-tricore)
+        export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest"
+        ;;
+    *)
+        export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
+        ;;
+esac
+
 if [ -z "$QEMU_IMG_PROG" ]; then
     if [ -x "$build_iotests/qemu-img" ]; then
         export QEMU_IMG_PROG="$build_iotests/qemu-img"
-- 
2.21.0

Re: [Qemu-devel] [PATCH 1/6] tests/qemu-iotests/check: Pick a default machine if necessary

[Alex Bennée]

Thomas Huth <thuth@redhat.com> writes:

> qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have
> a default machine, so when running the qemu-iotests with such a binary,
> lots of tests are failing. Fix it by picking a default machine in the
> "check" script instead.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tests/qemu-iotests/check | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> index f9c24b6753..922c5d1d3d 100755
> --- a/tests/qemu-iotests/check
> +++ b/tests/qemu-iotests/check
> @@ -130,7 +130,6 @@ export CACHEMODE="writeback"
>  export QEMU_IO_OPTIONS=""
>  export QEMU_IO_OPTIONS_NO_FMT=""
>  export CACHEMODE_IS_DEFAULT=true
> -export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
>  export VALGRIND_QEMU=
>  export IMGKEYSECRET=
>  export IMGOPTSSYNTAX=false
> @@ -564,6 +563,18 @@ then
>  fi
>  export QEMU_PROG="$(type -p "$QEMU_PROG")"
>
> +case "$QEMU_PROG" in
> +    *qemu-system-arm|*qemu-system-aarch64)
> +        export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest"
> +        ;;
> +    *qemu-system-tricore)
> +        export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest"
> +        ;;
> +    *)
> +        export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
> +        ;;
> +esac
> +
>  if [ -z "$QEMU_IMG_PROG" ]; then
>      if [ -x "$build_iotests/qemu-img" ]; then
>          export QEMU_IMG_PROG="$build_iotests/qemu-img"


--
Alex Bennée

Re: [Qemu-devel] [PATCH 1/6] tests/qemu-iotests/check: Pick a default machine if necessary

[Alex Bennée]

Thomas Huth <thuth@redhat.com> writes:

> qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have
> a default machine, so when running the qemu-iotests with such a binary,
> lots of tests are failing. Fix it by picking a default machine in the
> "check" script instead.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tests/qemu-iotests/check | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> index f9c24b6753..922c5d1d3d 100755
> --- a/tests/qemu-iotests/check
> +++ b/tests/qemu-iotests/check
> @@ -130,7 +130,6 @@ export CACHEMODE="writeback"
>  export QEMU_IO_OPTIONS=""
>  export QEMU_IO_OPTIONS_NO_FMT=""
>  export CACHEMODE_IS_DEFAULT=true
> -export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
>  export VALGRIND_QEMU=
>  export IMGKEYSECRET=
>  export IMGOPTSSYNTAX=false
> @@ -564,6 +563,18 @@ then
>  fi
>  export QEMU_PROG="$(type -p "$QEMU_PROG")"
>
> +case "$QEMU_PROG" in
> +    *qemu-system-arm|*qemu-system-aarch64)
> +        export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest"
> +        ;;
> +    *qemu-system-tricore)
> +        export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest"
> +        ;;
> +    *)
> +        export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
> +        ;;
> +esac
> +
>  if [ -z "$QEMU_IMG_PROG" ]; then
>      if [ -x "$build_iotests/qemu-img" ]; then
>          export QEMU_IMG_PROG="$build_iotests/qemu-img"


--
Alex Bennée

[Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Thomas Huth]

Tests in this group are supposed to run in every possible QEMU configuration.
That means they should run with every QEMU binary (also non-x86), without
dependencies on an optional features, they must work at least with the qcow2
image format and be able to run on all kind of host filesystems and users
(i.e. also as "nobody" or "root").

The initial list has been created as a subset of the "quick" group, where
I've disabled all tests that are failing with qemu-system-aarch64 or
qemu-system-tricore or in one of our CI pipelines.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/group | 194 ++++++++++++++++++++-------------------
 1 file changed, 102 insertions(+), 92 deletions(-)

diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index bae7718380..2ed42dcc14 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -4,63 +4,73 @@
 # - do not start group names with a digit
 #
 
+#
+# Some notes about the groups:
+# - Tests in the "quick" group should finish within some few seconds
+# - Tests in the "ci" group are suitable for running in CI systems. That
+#   means they should run with every QEMU binary (also non-x86), with
+#   every QEMU configuration (i.e. no dependency on an optional feature),
+#   at least with the qcow2 image format and all kind of host filesystems
+#   and users (i.e. also as "nobody" or "root").
+#
+
 #
 # test-group association ... one line per test
 #
-001 rw auto quick
-002 rw auto quick
+001 rw auto quick ci
+002 rw auto quick ci
 003 rw auto
-004 rw auto quick
-005 img auto quick
+004 rw auto quick ci
+005 img auto quick ci
 # 006 was removed, do not reuse
 007 snapshot auto
-008 rw auto quick
-009 rw auto quick
-010 rw auto quick
-011 rw auto quick
-012 auto quick
+008 rw auto quick ci
+009 rw auto quick ci
+010 rw auto quick ci
+011 rw auto quick ci
+012 auto quick ci
 013 rw auto
 014 rw auto
 015 rw snapshot auto
 # 016 was removed, do not reuse
-017 rw backing auto quick
-018 rw backing auto quick
-019 rw backing auto quick
-020 rw backing auto quick
-021 io auto quick
+017 rw backing auto quick ci
+018 rw backing auto quick ci
+019 rw backing auto quick ci
+020 rw backing auto quick ci
+021 io auto quick ci
 022 rw snapshot auto
 023 rw auto
-024 rw backing auto quick
-025 rw auto quick
+024 rw backing auto quick ci
+025 rw auto quick ci
 026 rw blkdbg auto
-027 rw auto quick
+027 rw auto quick ci
 028 rw backing auto quick
-029 rw auto quick
+029 rw auto quick ci
 030 rw auto backing
-031 rw auto quick
-032 rw auto quick
-033 rw auto quick
-034 rw auto backing quick
-035 rw auto quick
-036 rw auto quick
-037 rw auto backing quick
-038 rw auto backing quick
-039 rw auto quick
+031 rw auto quick ci
+032 rw auto quick ci
+033 rw auto quick ci
+034 rw auto backing quick ci
+035 rw auto quick ci
+036 rw auto quick ci
+037 rw auto backing quick ci
+038 rw auto backing quick ci
+039 rw auto quick ci
 040 rw auto
 041 rw auto backing
-042 rw auto quick
+042 rw auto quick ci
 043 rw auto backing
 044 rw auto
 045 rw auto quick
-046 rw auto aio quick
-047 rw auto quick
-048 img auto quick
+046 rw auto aio quick ci
+047 rw auto quick ci
+048 img auto quick ci
 049 rw auto
-050 rw auto backing quick
+050 rw auto backing quick ci
 051 rw auto
-052 rw auto backing quick
-053 rw auto quick
-054 rw auto quick
+052 rw auto backing quick ci
+053 rw auto quick ci
+054 rw auto quick ci
 055 rw auto
 056 rw auto backing
 057 rw auto
@@ -68,19 +78,19 @@
 059 rw auto quick
 060 rw auto quick
 061 rw auto
-062 rw auto quick
-063 rw auto quick
+062 rw auto quick ci
+063 rw auto quick ci
 064 rw auto quick
 065 rw auto quick
-066 rw auto quick
+066 rw auto quick ci
 067 rw auto quick
 068 rw auto quick
-069 rw auto quick
+069 rw auto quick ci
 070 rw auto quick
-071 rw auto quick
-072 rw auto quick
-073 rw auto quick
-074 rw auto quick
+071 rw auto quick ci
+072 rw auto quick ci
+073 rw auto quick ci
+074 rw auto quick ci
 075 rw auto quick
 076 auto
 077 rw auto quick
@@ -88,15 +98,15 @@
 079 rw auto
 080 rw auto
 081 rw auto quick
-082 rw auto quick
+082 rw auto quick ci
 083 rw auto
 084 img auto quick
 085 rw auto
-086 rw auto quick
+086 rw auto quick ci
 087 rw auto quick
 088 rw auto quick
-089 rw auto quick
-090 rw auto quick
+089 rw auto quick ci
+090 rw auto quick ci
 091 rw auto migration
 092 rw auto quick
 093 auto
@@ -104,29 +114,29 @@
 095 rw auto quick
 096 rw auto quick
 097 rw auto backing
-098 rw auto backing quick
-099 rw auto quick
+098 rw auto backing quick ci
+099 rw auto quick ci
 # 100 was removed, do not reuse
 101 rw auto quick
-102 rw auto quick
-103 rw auto quick
+102 rw auto quick ci
+103 rw auto quick ci
 104 rw auto
-105 rw auto quick
+105 rw auto quick ci
 106 rw auto quick
-107 rw auto quick
-108 rw auto quick
+107 rw auto quick ci
+108 rw auto quick ci
 109 rw auto
-110 rw auto backing quick
-111 rw auto quick
+110 rw auto backing quick ci
+111 rw auto quick ci
 112 rw auto
 113 rw auto quick
-114 rw auto quick
+114 rw auto quick ci
 115 rw auto
 116 rw auto quick
 117 rw auto
 118 rw auto
 119 rw auto quick
-120 rw auto quick
+120 rw auto quick ci
 121 rw auto
 122 rw auto
 123 rw auto quick
@@ -136,73 +146,73 @@
 127 rw auto backing quick
 128 rw auto quick
 129 rw auto quick
-130 rw auto quick
+130 rw auto quick ci
 131 rw auto quick
 132 rw auto quick
-133 auto quick
-134 rw auto quick
+133 auto quick ci
+134 rw auto quick ci
 135 rw auto
 136 rw auto
 137 rw auto
 138 rw auto quick
 139 rw auto quick
-140 rw auto quick
-141 rw auto quick
+140 rw auto quick ci
+141 rw auto quick ci
 142 auto
-143 auto quick
+143 auto quick ci
 144 rw auto quick
-145 auto quick
+145 auto quick ci
 146 auto quick
 147 auto
 148 rw auto quick
 149 rw auto sudo
-150 rw auto quick
+150 rw auto quick ci
 151 rw auto
 152 rw auto quick
 153 rw auto quick
-154 rw auto backing quick
+154 rw auto backing quick ci
 155 rw auto
-156 rw auto quick
+156 rw auto quick ci
 157 auto
-158 rw auto quick
-159 rw auto quick
+158 rw auto quick ci
+159 rw auto quick ci
 160 rw auto quick
-161 rw auto quick
+161 rw auto quick ci
 162 auto quick
 163 rw auto
 165 rw auto quick
 169 rw auto quick migration
-170 rw auto quick
+170 rw auto quick ci
 171 rw auto quick
 172 auto
 173 rw auto
 174 auto
 175 auto quick
 176 rw auto backing
-177 rw auto quick
+177 rw auto quick ci
 178 auto
-179 rw auto quick
+179 rw auto quick ci
 181 rw auto migration
 182 rw auto quick
 183 rw auto migration
-184 rw auto quick
+184 rw auto quick ci
 185 rw auto
 186 rw auto
 187 rw auto
 188 rw auto quick
 189 rw auto
-190 rw auto quick
+190 rw auto quick ci
 191 rw auto
 192 rw auto quick
 194 rw auto migration quick
-195 rw auto quick
+195 rw auto quick ci
 196 rw auto quick migration
-197 rw auto quick
+197 rw auto quick ci
 198 rw auto
 199 rw auto migration
 200 rw auto
 201 rw auto migration
-202 rw auto quick
+202 rw auto quick ci
 203 rw auto migration
 204 rw auto quick
 205 rw auto quick
@@ -215,25 +225,25 @@
 212 rw auto quick
 213 rw auto quick
 214 rw auto
-215 rw auto quick
-216 rw auto quick
-217 rw auto quick
-218 rw auto quick
+215 rw auto quick ci
+216 rw auto quick ci
+217 rw auto quick ci
+218 rw auto quick ci
 219 rw auto
 220 rw auto
 221 rw auto quick
 222 rw auto quick
 223 rw auto quick
-224 rw auto quick
+224 rw auto quick ci
 225 rw auto quick
-226 auto quick
+226 auto quick ci
 227 auto quick
-228 rw auto quick
-229 auto quick
+228 rw auto quick ci
+229 auto quick ci
 231 auto quick
 232 auto quick
-233 auto quick
-234 auto quick migration
+233 auto quick ci
+234 auto quick ci migration
 235 auto quick
 236 auto quick
 237 rw auto quick
@@ -242,9 +252,9 @@
 240 auto quick
 241 rw auto quick
 242 rw auto quick
-243 rw auto quick
-244 rw auto quick
+243 rw auto quick ci
+244 rw auto quick ci
 245 rw auto
 246 rw auto quick
-247 rw auto quick
+247 rw auto quick ci
 248 rw auto quick
-- 
2.21.0

[Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Thomas Huth]

Tests in this group are supposed to run in every possible QEMU configuration.
That means they should run with every QEMU binary (also non-x86), without
dependencies on an optional features, they must work at least with the qcow2
image format and be able to run on all kind of host filesystems and users
(i.e. also as "nobody" or "root").

The initial list has been created as a subset of the "quick" group, where
I've disabled all tests that are failing with qemu-system-aarch64 or
qemu-system-tricore or in one of our CI pipelines.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/group | 194 ++++++++++++++++++++-------------------
 1 file changed, 102 insertions(+), 92 deletions(-)

diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index bae7718380..2ed42dcc14 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -4,63 +4,73 @@
 # - do not start group names with a digit
 #
 
+#
+# Some notes about the groups:
+# - Tests in the "quick" group should finish within some few seconds
+# - Tests in the "ci" group are suitable for running in CI systems. That
+#   means they should run with every QEMU binary (also non-x86), with
+#   every QEMU configuration (i.e. no dependency on an optional feature),
+#   at least with the qcow2 image format and all kind of host filesystems
+#   and users (i.e. also as "nobody" or "root").
+#
+
 #
 # test-group association ... one line per test
 #
-001 rw auto quick
-002 rw auto quick
+001 rw auto quick ci
+002 rw auto quick ci
 003 rw auto
-004 rw auto quick
-005 img auto quick
+004 rw auto quick ci
+005 img auto quick ci
 # 006 was removed, do not reuse
 007 snapshot auto
-008 rw auto quick
-009 rw auto quick
-010 rw auto quick
-011 rw auto quick
-012 auto quick
+008 rw auto quick ci
+009 rw auto quick ci
+010 rw auto quick ci
+011 rw auto quick ci
+012 auto quick ci
 013 rw auto
 014 rw auto
 015 rw snapshot auto
 # 016 was removed, do not reuse
-017 rw backing auto quick
-018 rw backing auto quick
-019 rw backing auto quick
-020 rw backing auto quick
-021 io auto quick
+017 rw backing auto quick ci
+018 rw backing auto quick ci
+019 rw backing auto quick ci
+020 rw backing auto quick ci
+021 io auto quick ci
 022 rw snapshot auto
 023 rw auto
-024 rw backing auto quick
-025 rw auto quick
+024 rw backing auto quick ci
+025 rw auto quick ci
 026 rw blkdbg auto
-027 rw auto quick
+027 rw auto quick ci
 028 rw backing auto quick
-029 rw auto quick
+029 rw auto quick ci
 030 rw auto backing
-031 rw auto quick
-032 rw auto quick
-033 rw auto quick
-034 rw auto backing quick
-035 rw auto quick
-036 rw auto quick
-037 rw auto backing quick
-038 rw auto backing quick
-039 rw auto quick
+031 rw auto quick ci
+032 rw auto quick ci
+033 rw auto quick ci
+034 rw auto backing quick ci
+035 rw auto quick ci
+036 rw auto quick ci
+037 rw auto backing quick ci
+038 rw auto backing quick ci
+039 rw auto quick ci
 040 rw auto
 041 rw auto backing
-042 rw auto quick
+042 rw auto quick ci
 043 rw auto backing
 044 rw auto
 045 rw auto quick
-046 rw auto aio quick
-047 rw auto quick
-048 img auto quick
+046 rw auto aio quick ci
+047 rw auto quick ci
+048 img auto quick ci
 049 rw auto
-050 rw auto backing quick
+050 rw auto backing quick ci
 051 rw auto
-052 rw auto backing quick
-053 rw auto quick
-054 rw auto quick
+052 rw auto backing quick ci
+053 rw auto quick ci
+054 rw auto quick ci
 055 rw auto
 056 rw auto backing
 057 rw auto
@@ -68,19 +78,19 @@
 059 rw auto quick
 060 rw auto quick
 061 rw auto
-062 rw auto quick
-063 rw auto quick
+062 rw auto quick ci
+063 rw auto quick ci
 064 rw auto quick
 065 rw auto quick
-066 rw auto quick
+066 rw auto quick ci
 067 rw auto quick
 068 rw auto quick
-069 rw auto quick
+069 rw auto quick ci
 070 rw auto quick
-071 rw auto quick
-072 rw auto quick
-073 rw auto quick
-074 rw auto quick
+071 rw auto quick ci
+072 rw auto quick ci
+073 rw auto quick ci
+074 rw auto quick ci
 075 rw auto quick
 076 auto
 077 rw auto quick
@@ -88,15 +98,15 @@
 079 rw auto
 080 rw auto
 081 rw auto quick
-082 rw auto quick
+082 rw auto quick ci
 083 rw auto
 084 img auto quick
 085 rw auto
-086 rw auto quick
+086 rw auto quick ci
 087 rw auto quick
 088 rw auto quick
-089 rw auto quick
-090 rw auto quick
+089 rw auto quick ci
+090 rw auto quick ci
 091 rw auto migration
 092 rw auto quick
 093 auto
@@ -104,29 +114,29 @@
 095 rw auto quick
 096 rw auto quick
 097 rw auto backing
-098 rw auto backing quick
-099 rw auto quick
+098 rw auto backing quick ci
+099 rw auto quick ci
 # 100 was removed, do not reuse
 101 rw auto quick
-102 rw auto quick
-103 rw auto quick
+102 rw auto quick ci
+103 rw auto quick ci
 104 rw auto
-105 rw auto quick
+105 rw auto quick ci
 106 rw auto quick
-107 rw auto quick
-108 rw auto quick
+107 rw auto quick ci
+108 rw auto quick ci
 109 rw auto
-110 rw auto backing quick
-111 rw auto quick
+110 rw auto backing quick ci
+111 rw auto quick ci
 112 rw auto
 113 rw auto quick
-114 rw auto quick
+114 rw auto quick ci
 115 rw auto
 116 rw auto quick
 117 rw auto
 118 rw auto
 119 rw auto quick
-120 rw auto quick
+120 rw auto quick ci
 121 rw auto
 122 rw auto
 123 rw auto quick
@@ -136,73 +146,73 @@
 127 rw auto backing quick
 128 rw auto quick
 129 rw auto quick
-130 rw auto quick
+130 rw auto quick ci
 131 rw auto quick
 132 rw auto quick
-133 auto quick
-134 rw auto quick
+133 auto quick ci
+134 rw auto quick ci
 135 rw auto
 136 rw auto
 137 rw auto
 138 rw auto quick
 139 rw auto quick
-140 rw auto quick
-141 rw auto quick
+140 rw auto quick ci
+141 rw auto quick ci
 142 auto
-143 auto quick
+143 auto quick ci
 144 rw auto quick
-145 auto quick
+145 auto quick ci
 146 auto quick
 147 auto
 148 rw auto quick
 149 rw auto sudo
-150 rw auto quick
+150 rw auto quick ci
 151 rw auto
 152 rw auto quick
 153 rw auto quick
-154 rw auto backing quick
+154 rw auto backing quick ci
 155 rw auto
-156 rw auto quick
+156 rw auto quick ci
 157 auto
-158 rw auto quick
-159 rw auto quick
+158 rw auto quick ci
+159 rw auto quick ci
 160 rw auto quick
-161 rw auto quick
+161 rw auto quick ci
 162 auto quick
 163 rw auto
 165 rw auto quick
 169 rw auto quick migration
-170 rw auto quick
+170 rw auto quick ci
 171 rw auto quick
 172 auto
 173 rw auto
 174 auto
 175 auto quick
 176 rw auto backing
-177 rw auto quick
+177 rw auto quick ci
 178 auto
-179 rw auto quick
+179 rw auto quick ci
 181 rw auto migration
 182 rw auto quick
 183 rw auto migration
-184 rw auto quick
+184 rw auto quick ci
 185 rw auto
 186 rw auto
 187 rw auto
 188 rw auto quick
 189 rw auto
-190 rw auto quick
+190 rw auto quick ci
 191 rw auto
 192 rw auto quick
 194 rw auto migration quick
-195 rw auto quick
+195 rw auto quick ci
 196 rw auto quick migration
-197 rw auto quick
+197 rw auto quick ci
 198 rw auto
 199 rw auto migration
 200 rw auto
 201 rw auto migration
-202 rw auto quick
+202 rw auto quick ci
 203 rw auto migration
 204 rw auto quick
 205 rw auto quick
@@ -215,25 +225,25 @@
 212 rw auto quick
 213 rw auto quick
 214 rw auto
-215 rw auto quick
-216 rw auto quick
-217 rw auto quick
-218 rw auto quick
+215 rw auto quick ci
+216 rw auto quick ci
+217 rw auto quick ci
+218 rw auto quick ci
 219 rw auto
 220 rw auto
 221 rw auto quick
 222 rw auto quick
 223 rw auto quick
-224 rw auto quick
+224 rw auto quick ci
 225 rw auto quick
-226 auto quick
+226 auto quick ci
 227 auto quick
-228 rw auto quick
-229 auto quick
+228 rw auto quick ci
+229 auto quick ci
 231 auto quick
 232 auto quick
-233 auto quick
-234 auto quick migration
+233 auto quick ci
+234 auto quick ci migration
 235 auto quick
 236 auto quick
 237 rw auto quick
@@ -242,9 +252,9 @@
 240 auto quick
 241 rw auto quick
 242 rw auto quick
-243 rw auto quick
-244 rw auto quick
+243 rw auto quick ci
+244 rw auto quick ci
 245 rw auto
 246 rw auto quick
-247 rw auto quick
+247 rw auto quick ci
 248 rw auto quick
-- 
2.21.0

Re: [Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Daniel P. Berrangé]

On Wed, Apr 24, 2019 at 12:37:43PM +0200, Thomas Huth wrote:
> Tests in this group are supposed to run in every possible QEMU configuration.
> That means they should run with every QEMU binary (also non-x86), without
> dependencies on an optional features, they must work at least with the qcow2
> image format and be able to run on all kind of host filesystems and users
> (i.e. also as "nobody" or "root").
> 
> The initial list has been created as a subset of the "quick" group, where
> I've disabled all tests that are failing with qemu-system-aarch64 or
> qemu-system-tricore or in one of our CI pipelines.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/qemu-iotests/group | 194 ++++++++++++++++++++-------------------
>  1 file changed, 102 insertions(+), 92 deletions(-)
> 
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index bae7718380..2ed42dcc14 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -4,63 +4,73 @@
>  # - do not start group names with a digit
>  #
>  
> +#
> +# Some notes about the groups:
> +# - Tests in the "quick" group should finish within some few seconds
> +# - Tests in the "ci" group are suitable for running in CI systems. That
> +#   means they should run with every QEMU binary (also non-x86), with
> +#   every QEMU configuration (i.e. no dependency on an optional feature),
> +#   at least with the qcow2 image format and all kind of host filesystems
> +#   and users (i.e. also as "nobody" or "root").

No dependancy on optional features feels a bit restrictive from my POV.

We have quite alot of testing coverage of stuff that depends on the
crypto libraries that is important for us to run in "CI". This includes
LUKS block drivers, qcow2 with LUKS,  NBD with TLS. Personally I expect
all of those to be tested by CI systems.

IOW for a "CI" group, the bar should be higher than "no optional features"

Since we control the env used for CI via Docker or VM images, we can ensure
that they're populated with a set of packages that maximises our coverage.
All our platforms support gnutls for example, which gets us all the crypto
bits we need.

The problem of course is the desire to put this into "make check" by default
which developers can run in any configuration.

I think this is a sign that we need two distinct groupings.

Stuff run by a generic "make check" /should not/ depend on optional features,

Stuff run by an automated CI system /should/ depend on optional features. 

IOW, we should have:

   * "ci-min" - no deps on optional things configure might disable
   * "ci-max" - as many features as possible (assume Docker & VM
                images include them)

"make check" would default to "ci-min", but our CI systems can set
SPEED=thorough, causing "make check" to use "ci-max" instead ?

> -001 rw auto quick
> -002 rw auto quick
> +001 rw auto quick ci
> +002 rw auto quick ci
>  003 rw auto
> -004 rw auto quick
> -005 img auto quick
> +004 rw auto quick ci
> +005 img auto quick ci

Does anyone call what the "auto" group is supposed to be for ?

Its name kind of suggests it was for automated CI but maybe I'm reading
too much in to that ?


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Daniel P. Berrangé]

On Wed, Apr 24, 2019 at 12:37:43PM +0200, Thomas Huth wrote:
> Tests in this group are supposed to run in every possible QEMU configuration.
> That means they should run with every QEMU binary (also non-x86), without
> dependencies on an optional features, they must work at least with the qcow2
> image format and be able to run on all kind of host filesystems and users
> (i.e. also as "nobody" or "root").
> 
> The initial list has been created as a subset of the "quick" group, where
> I've disabled all tests that are failing with qemu-system-aarch64 or
> qemu-system-tricore or in one of our CI pipelines.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/qemu-iotests/group | 194 ++++++++++++++++++++-------------------
>  1 file changed, 102 insertions(+), 92 deletions(-)
> 
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index bae7718380..2ed42dcc14 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -4,63 +4,73 @@
>  # - do not start group names with a digit
>  #
>  
> +#
> +# Some notes about the groups:
> +# - Tests in the "quick" group should finish within some few seconds
> +# - Tests in the "ci" group are suitable for running in CI systems. That
> +#   means they should run with every QEMU binary (also non-x86), with
> +#   every QEMU configuration (i.e. no dependency on an optional feature),
> +#   at least with the qcow2 image format and all kind of host filesystems
> +#   and users (i.e. also as "nobody" or "root").

No dependancy on optional features feels a bit restrictive from my POV.

We have quite alot of testing coverage of stuff that depends on the
crypto libraries that is important for us to run in "CI". This includes
LUKS block drivers, qcow2 with LUKS,  NBD with TLS. Personally I expect
all of those to be tested by CI systems.

IOW for a "CI" group, the bar should be higher than "no optional features"

Since we control the env used for CI via Docker or VM images, we can ensure
that they're populated with a set of packages that maximises our coverage.
All our platforms support gnutls for example, which gets us all the crypto
bits we need.

The problem of course is the desire to put this into "make check" by default
which developers can run in any configuration.

I think this is a sign that we need two distinct groupings.

Stuff run by a generic "make check" /should not/ depend on optional features,

Stuff run by an automated CI system /should/ depend on optional features. 

IOW, we should have:

   * "ci-min" - no deps on optional things configure might disable
   * "ci-max" - as many features as possible (assume Docker & VM
                images include them)

"make check" would default to "ci-min", but our CI systems can set
SPEED=thorough, causing "make check" to use "ci-max" instead ?

> -001 rw auto quick
> -002 rw auto quick
> +001 rw auto quick ci
> +002 rw auto quick ci
>  003 rw auto
> -004 rw auto quick
> -005 img auto quick
> +004 rw auto quick ci
> +005 img auto quick ci

Does anyone call what the "auto" group is supposed to be for ?

Its name kind of suggests it was for automated CI but maybe I'm reading
too much in to that ?


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Thomas Huth]

On 24/04/2019 13.25, Daniel P. Berrangé wrote:
> On Wed, Apr 24, 2019 at 12:37:43PM +0200, Thomas Huth wrote:
>> Tests in this group are supposed to run in every possible QEMU configuration.
>> That means they should run with every QEMU binary (also non-x86), without
>> dependencies on an optional features, they must work at least with the qcow2
>> image format and be able to run on all kind of host filesystems and users
>> (i.e. also as "nobody" or "root").
>>
>> The initial list has been created as a subset of the "quick" group, where
>> I've disabled all tests that are failing with qemu-system-aarch64 or
>> qemu-system-tricore or in one of our CI pipelines.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  tests/qemu-iotests/group | 194 ++++++++++++++++++++-------------------
>>  1 file changed, 102 insertions(+), 92 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
>> index bae7718380..2ed42dcc14 100644
>> --- a/tests/qemu-iotests/group
>> +++ b/tests/qemu-iotests/group
>> @@ -4,63 +4,73 @@
>>  # - do not start group names with a digit
>>  #
>>  
>> +#
>> +# Some notes about the groups:
>> +# - Tests in the "quick" group should finish within some few seconds
>> +# - Tests in the "ci" group are suitable for running in CI systems. That
>> +#   means they should run with every QEMU binary (also non-x86), with
>> +#   every QEMU configuration (i.e. no dependency on an optional feature),
>> +#   at least with the qcow2 image format and all kind of host filesystems
>> +#   and users (i.e. also as "nobody" or "root").
> 
> No dependancy on optional features feels a bit restrictive from my POV.
> 
> We have quite alot of testing coverage of stuff that depends on the
> crypto libraries that is important for us to run in "CI". This includes
> LUKS block drivers, qcow2 with LUKS,  NBD with TLS. Personally I expect
> all of those to be tested by CI systems.
> 
> IOW for a "CI" group, the bar should be higher than "no optional features"

Ok, I think I just did not write it properly. What I meant was: the test
should not *fail* because of a missing feature (what some tests are
unfortunately doing). It's fine if the test detects the missing feature
and then marks the test as *skip*.

> Since we control the env used for CI via Docker or VM images, we can ensure
> that they're populated with a set of packages that maximises our coverage.
> All our platforms support gnutls for example, which gets us all the crypto
> bits we need.
> 
> The problem of course is the desire to put this into "make check" by default
> which developers can run in any configuration.
> 
> I think this is a sign that we need two distinct groupings.
> 
> Stuff run by a generic "make check" /should not/ depend on optional features,
> 
> Stuff run by an automated CI system /should/ depend on optional features. 

I think adding two new groups is not really needed here.
First, we already have the "quick" group that should contain most of the
tests with optional features. Second, just make sure that tests that
depend on optional features and still should be included in all CI
pipelines can detect the availability of the feature properly and report
"skip" if the feature is not available.

 Thomas

Re: [Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Thomas Huth]

On 24/04/2019 13.25, Daniel P. Berrangé wrote:
> On Wed, Apr 24, 2019 at 12:37:43PM +0200, Thomas Huth wrote:
>> Tests in this group are supposed to run in every possible QEMU configuration.
>> That means they should run with every QEMU binary (also non-x86), without
>> dependencies on an optional features, they must work at least with the qcow2
>> image format and be able to run on all kind of host filesystems and users
>> (i.e. also as "nobody" or "root").
>>
>> The initial list has been created as a subset of the "quick" group, where
>> I've disabled all tests that are failing with qemu-system-aarch64 or
>> qemu-system-tricore or in one of our CI pipelines.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  tests/qemu-iotests/group | 194 ++++++++++++++++++++-------------------
>>  1 file changed, 102 insertions(+), 92 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
>> index bae7718380..2ed42dcc14 100644
>> --- a/tests/qemu-iotests/group
>> +++ b/tests/qemu-iotests/group
>> @@ -4,63 +4,73 @@
>>  # - do not start group names with a digit
>>  #
>>  
>> +#
>> +# Some notes about the groups:
>> +# - Tests in the "quick" group should finish within some few seconds
>> +# - Tests in the "ci" group are suitable for running in CI systems. That
>> +#   means they should run with every QEMU binary (also non-x86), with
>> +#   every QEMU configuration (i.e. no dependency on an optional feature),
>> +#   at least with the qcow2 image format and all kind of host filesystems
>> +#   and users (i.e. also as "nobody" or "root").
> 
> No dependancy on optional features feels a bit restrictive from my POV.
> 
> We have quite alot of testing coverage of stuff that depends on the
> crypto libraries that is important for us to run in "CI". This includes
> LUKS block drivers, qcow2 with LUKS,  NBD with TLS. Personally I expect
> all of those to be tested by CI systems.
> 
> IOW for a "CI" group, the bar should be higher than "no optional features"

Ok, I think I just did not write it properly. What I meant was: the test
should not *fail* because of a missing feature (what some tests are
unfortunately doing). It's fine if the test detects the missing feature
and then marks the test as *skip*.

> Since we control the env used for CI via Docker or VM images, we can ensure
> that they're populated with a set of packages that maximises our coverage.
> All our platforms support gnutls for example, which gets us all the crypto
> bits we need.
> 
> The problem of course is the desire to put this into "make check" by default
> which developers can run in any configuration.
> 
> I think this is a sign that we need two distinct groupings.
> 
> Stuff run by a generic "make check" /should not/ depend on optional features,
> 
> Stuff run by an automated CI system /should/ depend on optional features. 

I think adding two new groups is not really needed here.
First, we already have the "quick" group that should contain most of the
tests with optional features. Second, just make sure that tests that
depend on optional features and still should be included in all CI
pipelines can detect the availability of the feature properly and report
"skip" if the feature is not available.

 Thomas

Re: [Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Daniel P. Berrangé]

On Wed, Apr 24, 2019 at 02:37:02PM +0200, Thomas Huth wrote:
> On 24/04/2019 13.25, Daniel P. Berrangé wrote:
> > On Wed, Apr 24, 2019 at 12:37:43PM +0200, Thomas Huth wrote:
> >> Tests in this group are supposed to run in every possible QEMU configuration.
> >> That means they should run with every QEMU binary (also non-x86), without
> >> dependencies on an optional features, they must work at least with the qcow2
> >> image format and be able to run on all kind of host filesystems and users
> >> (i.e. also as "nobody" or "root").
> >>
> >> The initial list has been created as a subset of the "quick" group, where
> >> I've disabled all tests that are failing with qemu-system-aarch64 or
> >> qemu-system-tricore or in one of our CI pipelines.
> >>
> >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >> ---
> >>  tests/qemu-iotests/group | 194 ++++++++++++++++++++-------------------
> >>  1 file changed, 102 insertions(+), 92 deletions(-)
> >>
> >> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> >> index bae7718380..2ed42dcc14 100644
> >> --- a/tests/qemu-iotests/group
> >> +++ b/tests/qemu-iotests/group
> >> @@ -4,63 +4,73 @@
> >>  # - do not start group names with a digit
> >>  #
> >>  
> >> +#
> >> +# Some notes about the groups:
> >> +# - Tests in the "quick" group should finish within some few seconds
> >> +# - Tests in the "ci" group are suitable for running in CI systems. That
> >> +#   means they should run with every QEMU binary (also non-x86), with
> >> +#   every QEMU configuration (i.e. no dependency on an optional feature),
> >> +#   at least with the qcow2 image format and all kind of host filesystems
> >> +#   and users (i.e. also as "nobody" or "root").
> > 
> > No dependancy on optional features feels a bit restrictive from my POV.
> > 
> > We have quite alot of testing coverage of stuff that depends on the
> > crypto libraries that is important for us to run in "CI". This includes
> > LUKS block drivers, qcow2 with LUKS,  NBD with TLS. Personally I expect
> > all of those to be tested by CI systems.
> > 
> > IOW for a "CI" group, the bar should be higher than "no optional features"
> 
> Ok, I think I just did not write it properly. What I meant was: the test
> should not *fail* because of a missing feature (what some tests are
> unfortunately doing). It's fine if the test detects the missing feature
> and then marks the test as *skip*.

Ok, this brings back the topic I don't think we ever resolved around how
to best "detect" features in the iotests. eg if we want to know whether
we can use TLS features, how do we decide this ?

One option is to do a dummy launch of QEMU using TLS & check if it fails,
but that's kind of fragile for CI. A genuine bug in QEMU might cause this
dummy launch to fail, and thus mistakenly skip all the tests instead of
failing.

We can't look at config-host.{h,mak} either as iotests are supposed to be
runnable outside of a build tree.

We could look at whether gnutls is linked to QEMU but again that is going
to be fragile if a bug in configure causes us to mistakenly stop enabling
gnutls.

For developers, dynamically probing features & skipping is reasonable.

For automated CI, I think we should set clear desired featureset upfront
based on what we know we are supposde to have available and not silently
skip tests


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Daniel P. Berrangé]

On Wed, Apr 24, 2019 at 02:37:02PM +0200, Thomas Huth wrote:
> On 24/04/2019 13.25, Daniel P. Berrangé wrote:
> > On Wed, Apr 24, 2019 at 12:37:43PM +0200, Thomas Huth wrote:
> >> Tests in this group are supposed to run in every possible QEMU configuration.
> >> That means they should run with every QEMU binary (also non-x86), without
> >> dependencies on an optional features, they must work at least with the qcow2
> >> image format and be able to run on all kind of host filesystems and users
> >> (i.e. also as "nobody" or "root").
> >>
> >> The initial list has been created as a subset of the "quick" group, where
> >> I've disabled all tests that are failing with qemu-system-aarch64 or
> >> qemu-system-tricore or in one of our CI pipelines.
> >>
> >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >> ---
> >>  tests/qemu-iotests/group | 194 ++++++++++++++++++++-------------------
> >>  1 file changed, 102 insertions(+), 92 deletions(-)
> >>
> >> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> >> index bae7718380..2ed42dcc14 100644
> >> --- a/tests/qemu-iotests/group
> >> +++ b/tests/qemu-iotests/group
> >> @@ -4,63 +4,73 @@
> >>  # - do not start group names with a digit
> >>  #
> >>  
> >> +#
> >> +# Some notes about the groups:
> >> +# - Tests in the "quick" group should finish within some few seconds
> >> +# - Tests in the "ci" group are suitable for running in CI systems. That
> >> +#   means they should run with every QEMU binary (also non-x86), with
> >> +#   every QEMU configuration (i.e. no dependency on an optional feature),
> >> +#   at least with the qcow2 image format and all kind of host filesystems
> >> +#   and users (i.e. also as "nobody" or "root").
> > 
> > No dependancy on optional features feels a bit restrictive from my POV.
> > 
> > We have quite alot of testing coverage of stuff that depends on the
> > crypto libraries that is important for us to run in "CI". This includes
> > LUKS block drivers, qcow2 with LUKS,  NBD with TLS. Personally I expect
> > all of those to be tested by CI systems.
> > 
> > IOW for a "CI" group, the bar should be higher than "no optional features"
> 
> Ok, I think I just did not write it properly. What I meant was: the test
> should not *fail* because of a missing feature (what some tests are
> unfortunately doing). It's fine if the test detects the missing feature
> and then marks the test as *skip*.

Ok, this brings back the topic I don't think we ever resolved around how
to best "detect" features in the iotests. eg if we want to know whether
we can use TLS features, how do we decide this ?

One option is to do a dummy launch of QEMU using TLS & check if it fails,
but that's kind of fragile for CI. A genuine bug in QEMU might cause this
dummy launch to fail, and thus mistakenly skip all the tests instead of
failing.

We can't look at config-host.{h,mak} either as iotests are supposed to be
runnable outside of a build tree.

We could look at whether gnutls is linked to QEMU but again that is going
to be fragile if a bug in configure causes us to mistakenly stop enabling
gnutls.

For developers, dynamically probing features & skipping is reasonable.

For automated CI, I think we should set clear desired featureset upfront
based on what we know we are supposde to have available and not silently
skip tests


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Thomas Huth]

On 24/04/2019 14.50, Daniel P. Berrangé wrote:
[...]
> For automated CI, I think we should set clear desired featureset upfront
> based on what we know we are supposde to have available and not silently
> skip tests

If someone really cares about running an certain iotest that depends on
an optional feature in a CI system (so far there apparently was not much
interest yet - see e.g. .travis.yml), you can also manually list the
tests that you care about in the corresponding yml file. I did so in the
.gitlab-ci.yml already for a couple of tests. Feel free to add some more
tests there after making sure that the corresponding features are
enabled in the build process before.

 Thomas

Re: [Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Thomas Huth]

On 24/04/2019 14.50, Daniel P. Berrangé wrote:
[...]
> For automated CI, I think we should set clear desired featureset upfront
> based on what we know we are supposde to have available and not silently
> skip tests

If someone really cares about running an certain iotest that depends on
an optional feature in a CI system (so far there apparently was not much
interest yet - see e.g. .travis.yml), you can also manually list the
tests that you care about in the corresponding yml file. I did so in the
.gitlab-ci.yml already for a couple of tests. Feel free to add some more
tests there after making sure that the corresponding features are
enabled in the build process before.

 Thomas

Re: [Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Daniel P. Berrangé]

On Wed, Apr 24, 2019 at 01:50:46PM +0100, Daniel P. Berrangé wrote:
> On Wed, Apr 24, 2019 at 02:37:02PM +0200, Thomas Huth wrote:
> > On 24/04/2019 13.25, Daniel P. Berrangé wrote:
> > > On Wed, Apr 24, 2019 at 12:37:43PM +0200, Thomas Huth wrote:
> > >> Tests in this group are supposed to run in every possible QEMU configuration.
> > >> That means they should run with every QEMU binary (also non-x86), without
> > >> dependencies on an optional features, they must work at least with the qcow2
> > >> image format and be able to run on all kind of host filesystems and users
> > >> (i.e. also as "nobody" or "root").
> > >>
> > >> The initial list has been created as a subset of the "quick" group, where
> > >> I've disabled all tests that are failing with qemu-system-aarch64 or
> > >> qemu-system-tricore or in one of our CI pipelines.
> > >>
> > >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> > >> ---
> > >>  tests/qemu-iotests/group | 194 ++++++++++++++++++++-------------------
> > >>  1 file changed, 102 insertions(+), 92 deletions(-)
> > >>
> > >> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> > >> index bae7718380..2ed42dcc14 100644
> > >> --- a/tests/qemu-iotests/group
> > >> +++ b/tests/qemu-iotests/group
> > >> @@ -4,63 +4,73 @@
> > >>  # - do not start group names with a digit
> > >>  #
> > >>  
> > >> +#
> > >> +# Some notes about the groups:
> > >> +# - Tests in the "quick" group should finish within some few seconds
> > >> +# - Tests in the "ci" group are suitable for running in CI systems. That
> > >> +#   means they should run with every QEMU binary (also non-x86), with
> > >> +#   every QEMU configuration (i.e. no dependency on an optional feature),
> > >> +#   at least with the qcow2 image format and all kind of host filesystems
> > >> +#   and users (i.e. also as "nobody" or "root").
> > > 
> > > No dependancy on optional features feels a bit restrictive from my POV.
> > > 
> > > We have quite alot of testing coverage of stuff that depends on the
> > > crypto libraries that is important for us to run in "CI". This includes
> > > LUKS block drivers, qcow2 with LUKS,  NBD with TLS. Personally I expect
> > > all of those to be tested by CI systems.
> > > 
> > > IOW for a "CI" group, the bar should be higher than "no optional features"
> > 
> > Ok, I think I just did not write it properly. What I meant was: the test
> > should not *fail* because of a missing feature (what some tests are
> > unfortunately doing). It's fine if the test detects the missing feature
> > and then marks the test as *skip*.
> 
> Ok, this brings back the topic I don't think we ever resolved around how
> to best "detect" features in the iotests. eg if we want to know whether
> we can use TLS features, how do we decide this ?
> 
> One option is to do a dummy launch of QEMU using TLS & check if it fails,
> but that's kind of fragile for CI. A genuine bug in QEMU might cause this
> dummy launch to fail, and thus mistakenly skip all the tests instead of
> failing.
> 
> We can't look at config-host.{h,mak} either as iotests are supposed to be
> runnable outside of a build tree.
> 
> We could look at whether gnutls is linked to QEMU but again that is going
> to be fragile if a bug in configure causes us to mistakenly stop enabling
> gnutls.
> 
> For developers, dynamically probing features & skipping is reasonable.
> 
> For automated CI, I think we should set clear desired featureset upfront
> based on what we know we are supposde to have available and not silently
> skip tests

I guess I should say "perfect is the enemy of good". What you propose
with "make check" is clearly better than what we have today which is
nothing by default.  So my point about defined featureset for running
under CI shouldn't be a blocker of the "make check" improvement.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Daniel P. Berrangé]

On Wed, Apr 24, 2019 at 01:50:46PM +0100, Daniel P. Berrangé wrote:
> On Wed, Apr 24, 2019 at 02:37:02PM +0200, Thomas Huth wrote:
> > On 24/04/2019 13.25, Daniel P. Berrangé wrote:
> > > On Wed, Apr 24, 2019 at 12:37:43PM +0200, Thomas Huth wrote:
> > >> Tests in this group are supposed to run in every possible QEMU configuration.
> > >> That means they should run with every QEMU binary (also non-x86), without
> > >> dependencies on an optional features, they must work at least with the qcow2
> > >> image format and be able to run on all kind of host filesystems and users
> > >> (i.e. also as "nobody" or "root").
> > >>
> > >> The initial list has been created as a subset of the "quick" group, where
> > >> I've disabled all tests that are failing with qemu-system-aarch64 or
> > >> qemu-system-tricore or in one of our CI pipelines.
> > >>
> > >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> > >> ---
> > >>  tests/qemu-iotests/group | 194 ++++++++++++++++++++-------------------
> > >>  1 file changed, 102 insertions(+), 92 deletions(-)
> > >>
> > >> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> > >> index bae7718380..2ed42dcc14 100644
> > >> --- a/tests/qemu-iotests/group
> > >> +++ b/tests/qemu-iotests/group
> > >> @@ -4,63 +4,73 @@
> > >>  # - do not start group names with a digit
> > >>  #
> > >>  
> > >> +#
> > >> +# Some notes about the groups:
> > >> +# - Tests in the "quick" group should finish within some few seconds
> > >> +# - Tests in the "ci" group are suitable for running in CI systems. That
> > >> +#   means they should run with every QEMU binary (also non-x86), with
> > >> +#   every QEMU configuration (i.e. no dependency on an optional feature),
> > >> +#   at least with the qcow2 image format and all kind of host filesystems
> > >> +#   and users (i.e. also as "nobody" or "root").
> > > 
> > > No dependancy on optional features feels a bit restrictive from my POV.
> > > 
> > > We have quite alot of testing coverage of stuff that depends on the
> > > crypto libraries that is important for us to run in "CI". This includes
> > > LUKS block drivers, qcow2 with LUKS,  NBD with TLS. Personally I expect
> > > all of those to be tested by CI systems.
> > > 
> > > IOW for a "CI" group, the bar should be higher than "no optional features"
> > 
> > Ok, I think I just did not write it properly. What I meant was: the test
> > should not *fail* because of a missing feature (what some tests are
> > unfortunately doing). It's fine if the test detects the missing feature
> > and then marks the test as *skip*.
> 
> Ok, this brings back the topic I don't think we ever resolved around how
> to best "detect" features in the iotests. eg if we want to know whether
> we can use TLS features, how do we decide this ?
> 
> One option is to do a dummy launch of QEMU using TLS & check if it fails,
> but that's kind of fragile for CI. A genuine bug in QEMU might cause this
> dummy launch to fail, and thus mistakenly skip all the tests instead of
> failing.
> 
> We can't look at config-host.{h,mak} either as iotests are supposed to be
> runnable outside of a build tree.
> 
> We could look at whether gnutls is linked to QEMU but again that is going
> to be fragile if a bug in configure causes us to mistakenly stop enabling
> gnutls.
> 
> For developers, dynamically probing features & skipping is reasonable.
> 
> For automated CI, I think we should set clear desired featureset upfront
> based on what we know we are supposde to have available and not silently
> skip tests

I guess I should say "perfect is the enemy of good". What you propose
with "make check" is clearly better than what we have today which is
nothing by default.  So my point about defined featureset for running
under CI shouldn't be a blocker of the "make check" improvement.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Thomas Huth]

On 24/04/2019 14.50, Daniel P. Berrangé wrote:
> On Wed, Apr 24, 2019 at 02:37:02PM +0200, Thomas Huth wrote:
>> On 24/04/2019 13.25, Daniel P. Berrangé wrote:
>>> On Wed, Apr 24, 2019 at 12:37:43PM +0200, Thomas Huth wrote:
>>>> Tests in this group are supposed to run in every possible QEMU configuration.
>>>> That means they should run with every QEMU binary (also non-x86), without
>>>> dependencies on an optional features, they must work at least with the qcow2
>>>> image format and be able to run on all kind of host filesystems and users
>>>> (i.e. also as "nobody" or "root").
>>>>
>>>> The initial list has been created as a subset of the "quick" group, where
>>>> I've disabled all tests that are failing with qemu-system-aarch64 or
>>>> qemu-system-tricore or in one of our CI pipelines.
>>>>
>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>> ---
>>>>  tests/qemu-iotests/group | 194 ++++++++++++++++++++-------------------
>>>>  1 file changed, 102 insertions(+), 92 deletions(-)
>>>>
>>>> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
>>>> index bae7718380..2ed42dcc14 100644
>>>> --- a/tests/qemu-iotests/group
>>>> +++ b/tests/qemu-iotests/group
>>>> @@ -4,63 +4,73 @@
>>>>  # - do not start group names with a digit
>>>>  #
>>>>  
>>>> +#
>>>> +# Some notes about the groups:
>>>> +# - Tests in the "quick" group should finish within some few seconds
>>>> +# - Tests in the "ci" group are suitable for running in CI systems. That
>>>> +#   means they should run with every QEMU binary (also non-x86), with
>>>> +#   every QEMU configuration (i.e. no dependency on an optional feature),
>>>> +#   at least with the qcow2 image format and all kind of host filesystems
>>>> +#   and users (i.e. also as "nobody" or "root").
>>>
>>> No dependancy on optional features feels a bit restrictive from my POV.
>>>
>>> We have quite alot of testing coverage of stuff that depends on the
>>> crypto libraries that is important for us to run in "CI". This includes
>>> LUKS block drivers, qcow2 with LUKS,  NBD with TLS. Personally I expect
>>> all of those to be tested by CI systems.
>>>
>>> IOW for a "CI" group, the bar should be higher than "no optional features"
>>
>> Ok, I think I just did not write it properly. What I meant was: the test
>> should not *fail* because of a missing feature (what some tests are
>> unfortunately doing). It's fine if the test detects the missing feature
>> and then marks the test as *skip*.
> 
> Ok, this brings back the topic I don't think we ever resolved around how
> to best "detect" features in the iotests. eg if we want to know whether
> we can use TLS features, how do we decide this ?
> 
> One option is to do a dummy launch of QEMU using TLS & check if it fails,
> but that's kind of fragile for CI. A genuine bug in QEMU might cause this
> dummy launch to fail, and thus mistakenly skip all the tests instead of
> failing.

Maybe we need a "--dump-features" option for QEMU (or a QMP command)?
(somewhat similar to "gcc -dumpspecs" for example?)

 Thomas

Re: [Qemu-devel] [PATCH 2/6] tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines

[Thomas Huth]

On 24/04/2019 14.50, Daniel P. Berrangé wrote:
> On Wed, Apr 24, 2019 at 02:37:02PM +0200, Thomas Huth wrote:
>> On 24/04/2019 13.25, Daniel P. Berrangé wrote:
>>> On Wed, Apr 24, 2019 at 12:37:43PM +0200, Thomas Huth wrote:
>>>> Tests in this group are supposed to run in every possible QEMU configuration.
>>>> That means they should run with every QEMU binary (also non-x86), without
>>>> dependencies on an optional features, they must work at least with the qcow2
>>>> image format and be able to run on all kind of host filesystems and users
>>>> (i.e. also as "nobody" or "root").
>>>>
>>>> The initial list has been created as a subset of the "quick" group, where
>>>> I've disabled all tests that are failing with qemu-system-aarch64 or
>>>> qemu-system-tricore or in one of our CI pipelines.
>>>>
>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>> ---
>>>>  tests/qemu-iotests/group | 194 ++++++++++++++++++++-------------------
>>>>  1 file changed, 102 insertions(+), 92 deletions(-)
>>>>
>>>> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
>>>> index bae7718380..2ed42dcc14 100644
>>>> --- a/tests/qemu-iotests/group
>>>> +++ b/tests/qemu-iotests/group
>>>> @@ -4,63 +4,73 @@
>>>>  # - do not start group names with a digit
>>>>  #
>>>>  
>>>> +#
>>>> +# Some notes about the groups:
>>>> +# - Tests in the "quick" group should finish within some few seconds
>>>> +# - Tests in the "ci" group are suitable for running in CI systems. That
>>>> +#   means they should run with every QEMU binary (also non-x86), with
>>>> +#   every QEMU configuration (i.e. no dependency on an optional feature),
>>>> +#   at least with the qcow2 image format and all kind of host filesystems
>>>> +#   and users (i.e. also as "nobody" or "root").
>>>
>>> No dependancy on optional features feels a bit restrictive from my POV.
>>>
>>> We have quite alot of testing coverage of stuff that depends on the
>>> crypto libraries that is important for us to run in "CI". This includes
>>> LUKS block drivers, qcow2 with LUKS,  NBD with TLS. Personally I expect
>>> all of those to be tested by CI systems.
>>>
>>> IOW for a "CI" group, the bar should be higher than "no optional features"
>>
>> Ok, I think I just did not write it properly. What I meant was: the test
>> should not *fail* because of a missing feature (what some tests are
>> unfortunately doing). It's fine if the test detects the missing feature
>> and then marks the test as *skip*.
> 
> Ok, this brings back the topic I don't think we ever resolved around how
> to best "detect" features in the iotests. eg if we want to know whether
> we can use TLS features, how do we decide this ?
> 
> One option is to do a dummy launch of QEMU using TLS & check if it fails,
> but that's kind of fragile for CI. A genuine bug in QEMU might cause this
> dummy launch to fail, and thus mistakenly skip all the tests instead of
> failing.

Maybe we need a "--dump-features" option for QEMU (or a QMP command)?
(somewhat similar to "gcc -dumpspecs" for example?)

 Thomas

[Qemu-devel] [PATCH 3/6] tests/qemu-iotests: Do not hard-code the path to bash

[Thomas Huth]

bash is installed in a different directory on non-Linux systems like
FreeBSD. Do not hard-code /bin/bash here so that the tests can run
there, too.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/239 | 2 +-
 tests/qemu-iotests/240 | 2 +-
 tests/qemu-iotests/241 | 2 +-
 tests/qemu-iotests/243 | 2 +-
 tests/qemu-iotests/244 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/qemu-iotests/239 b/tests/qemu-iotests/239
index 6f085d573d..b0991ffe59 100755
--- a/tests/qemu-iotests/239
+++ b/tests/qemu-iotests/239
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Test case for dmg
 #
diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
index 65cc3b39b1..d3e663ed65 100755
--- a/tests/qemu-iotests/240
+++ b/tests/qemu-iotests/240
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Test hot plugging and unplugging with iothreads
 #
diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241
index 017a736aab..58b64ebf41 100755
--- a/tests/qemu-iotests/241
+++ b/tests/qemu-iotests/241
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Test qemu-nbd vs. unaligned images
 #
diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index 5838c6e89c..e563761307 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Test qcow2 preallocation
 #
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index d8e7122305..13978f93d2 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Test qcow2 with external data files
 #
-- 
2.21.0

[Qemu-devel] [PATCH 3/6] tests/qemu-iotests: Do not hard-code the path to bash

[Thomas Huth]

bash is installed in a different directory on non-Linux systems like
FreeBSD. Do not hard-code /bin/bash here so that the tests can run
there, too.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/239 | 2 +-
 tests/qemu-iotests/240 | 2 +-
 tests/qemu-iotests/241 | 2 +-
 tests/qemu-iotests/243 | 2 +-
 tests/qemu-iotests/244 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/qemu-iotests/239 b/tests/qemu-iotests/239
index 6f085d573d..b0991ffe59 100755
--- a/tests/qemu-iotests/239
+++ b/tests/qemu-iotests/239
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Test case for dmg
 #
diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
index 65cc3b39b1..d3e663ed65 100755
--- a/tests/qemu-iotests/240
+++ b/tests/qemu-iotests/240
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Test hot plugging and unplugging with iothreads
 #
diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241
index 017a736aab..58b64ebf41 100755
--- a/tests/qemu-iotests/241
+++ b/tests/qemu-iotests/241
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Test qemu-nbd vs. unaligned images
 #
diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index 5838c6e89c..e563761307 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Test qcow2 preallocation
 #
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index d8e7122305..13978f93d2 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Test qcow2 with external data files
 #
-- 
2.21.0

Re: [Qemu-devel] [PATCH 3/6] tests/qemu-iotests: Do not hard-code the path to bash

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 754 bytes --]

On 4/24/19 5:37 AM, Thomas Huth wrote:
> bash is installed in a different directory on non-Linux systems like
> FreeBSD. Do not hard-code /bin/bash here so that the tests can run
> there, too.

These tests were obviously copy-and-pasted from a fork point prior to
commit 11a82d14.

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/qemu-iotests/239 | 2 +-
>  tests/qemu-iotests/240 | 2 +-
>  tests/qemu-iotests/241 | 2 +-
>  tests/qemu-iotests/243 | 2 +-
>  tests/qemu-iotests/244 | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)


-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [Qemu-devel] [PATCH 3/6] tests/qemu-iotests: Do not hard-code the path to bash

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 754 bytes --]

On 4/24/19 5:37 AM, Thomas Huth wrote:
> bash is installed in a different directory on non-Linux systems like
> FreeBSD. Do not hard-code /bin/bash here so that the tests can run
> there, too.

These tests were obviously copy-and-pasted from a fork point prior to
commit 11a82d14.

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/qemu-iotests/239 | 2 +-
>  tests/qemu-iotests/240 | 2 +-
>  tests/qemu-iotests/241 | 2 +-
>  tests/qemu-iotests/243 | 2 +-
>  tests/qemu-iotests/244 | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)


-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [Qemu-devel] [PATCH 3/6] tests/qemu-iotests: Do not hard-code the path to bash

[Philippe Mathieu-Daudé]

On 4/24/19 4:14 PM, Eric Blake wrote:
> On 4/24/19 5:37 AM, Thomas Huth wrote:
>> bash is installed in a different directory on non-Linux systems like
>> FreeBSD. Do not hard-code /bin/bash here so that the tests can run
>> there, too.
> 
> These tests were obviously copy-and-pasted from a fork point prior to
> commit 11a82d14.

:(

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> 
> Reviewed-by: Eric Blake <eblake@redhat.com>
> 
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  tests/qemu-iotests/239 | 2 +-
>>  tests/qemu-iotests/240 | 2 +-
>>  tests/qemu-iotests/241 | 2 +-
>>  tests/qemu-iotests/243 | 2 +-
>>  tests/qemu-iotests/244 | 2 +-
>>  5 files changed, 5 insertions(+), 5 deletions(-)
> 
> 

Re: [Qemu-devel] [PATCH 3/6] tests/qemu-iotests: Do not hard-code the path to bash

[Philippe Mathieu-Daudé]

On 4/24/19 4:14 PM, Eric Blake wrote:
> On 4/24/19 5:37 AM, Thomas Huth wrote:
>> bash is installed in a different directory on non-Linux systems like
>> FreeBSD. Do not hard-code /bin/bash here so that the tests can run
>> there, too.
> 
> These tests were obviously copy-and-pasted from a fork point prior to
> commit 11a82d14.

:(

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> 
> Reviewed-by: Eric Blake <eblake@redhat.com>
> 
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  tests/qemu-iotests/239 | 2 +-
>>  tests/qemu-iotests/240 | 2 +-
>>  tests/qemu-iotests/241 | 2 +-
>>  tests/qemu-iotests/243 | 2 +-
>>  tests/qemu-iotests/244 | 2 +-
>>  5 files changed, 5 insertions(+), 5 deletions(-)
> 
> 

Re: [Qemu-devel] [PATCH 3/6] tests/qemu-iotests: Do not hard-code the path to bash

[Daniel P. Berrangé]

On Wed, Apr 24, 2019 at 09:14:29AM -0500, Eric Blake wrote:
> On 4/24/19 5:37 AM, Thomas Huth wrote:
> > bash is installed in a different directory on non-Linux systems like
> > FreeBSD. Do not hard-code /bin/bash here so that the tests can run
> > there, too.
> 
> These tests were obviously copy-and-pasted from a fork point prior to
> commit 11a82d14.

Is this a candidate for a checkpatch addition to reject any use
of /bin/bash in scripts ?

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 3/6] tests/qemu-iotests: Do not hard-code the path to bash

[Daniel P. Berrangé]

On Wed, Apr 24, 2019 at 09:14:29AM -0500, Eric Blake wrote:
> On 4/24/19 5:37 AM, Thomas Huth wrote:
> > bash is installed in a different directory on non-Linux systems like
> > FreeBSD. Do not hard-code /bin/bash here so that the tests can run
> > there, too.
> 
> These tests were obviously copy-and-pasted from a fork point prior to
> commit 11a82d14.

Is this a candidate for a checkpatch addition to reject any use
of /bin/bash in scripts ?

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 3/6] tests/qemu-iotests: Do not hard-code the path to bash

[Thomas Huth]

On 24/04/2019 17.23, Daniel P. Berrangé wrote:
> On Wed, Apr 24, 2019 at 09:14:29AM -0500, Eric Blake wrote:
>> On 4/24/19 5:37 AM, Thomas Huth wrote:
>>> bash is installed in a different directory on non-Linux systems like
>>> FreeBSD. Do not hard-code /bin/bash here so that the tests can run
>>> there, too.
>>
>> These tests were obviously copy-and-pasted from a fork point prior to
>> commit 11a82d14.
> 
> Is this a candidate for a checkpatch addition to reject any use
> of /bin/bash in scripts ?

Not sure whether we should really reject it with an error (there might
be scripts that are only used on Linux anyway), but checkpatch.pl should
at least print a warning, I think.

 Thomas

Re: [Qemu-devel] [PATCH 3/6] tests/qemu-iotests: Do not hard-code the path to bash

[Thomas Huth]

On 24/04/2019 17.23, Daniel P. Berrangé wrote:
> On Wed, Apr 24, 2019 at 09:14:29AM -0500, Eric Blake wrote:
>> On 4/24/19 5:37 AM, Thomas Huth wrote:
>>> bash is installed in a different directory on non-Linux systems like
>>> FreeBSD. Do not hard-code /bin/bash here so that the tests can run
>>> there, too.
>>
>> These tests were obviously copy-and-pasted from a fork point prior to
>> commit 11a82d14.
> 
> Is this a candidate for a checkpatch addition to reject any use
> of /bin/bash in scripts ?

Not sure whether we should really reject it with an error (there might
be scripts that are only used on Linux anyway), but checkpatch.pl should
at least print a warning, I think.

 Thomas

Re: [Qemu-devel] [PATCH 3/6] tests/qemu-iotests: Do not hard-code the path to bash

[Alex Bennée]

Thomas Huth <thuth@redhat.com> writes:

> bash is installed in a different directory on non-Linux systems like
> FreeBSD. Do not hard-code /bin/bash here so that the tests can run
> there, too.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tests/qemu-iotests/239 | 2 +-
>  tests/qemu-iotests/240 | 2 +-
>  tests/qemu-iotests/241 | 2 +-
>  tests/qemu-iotests/243 | 2 +-
>  tests/qemu-iotests/244 | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tests/qemu-iotests/239 b/tests/qemu-iotests/239
> index 6f085d573d..b0991ffe59 100755
> --- a/tests/qemu-iotests/239
> +++ b/tests/qemu-iotests/239
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  #
>  # Test case for dmg
>  #
> diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
> index 65cc3b39b1..d3e663ed65 100755
> --- a/tests/qemu-iotests/240
> +++ b/tests/qemu-iotests/240
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  #
>  # Test hot plugging and unplugging with iothreads
>  #
> diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241
> index 017a736aab..58b64ebf41 100755
> --- a/tests/qemu-iotests/241
> +++ b/tests/qemu-iotests/241
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  #
>  # Test qemu-nbd vs. unaligned images
>  #
> diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
> index 5838c6e89c..e563761307 100755
> --- a/tests/qemu-iotests/243
> +++ b/tests/qemu-iotests/243
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  #
>  # Test qcow2 preallocation
>  #
> diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
> index d8e7122305..13978f93d2 100755
> --- a/tests/qemu-iotests/244
> +++ b/tests/qemu-iotests/244
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  #
>  # Test qcow2 with external data files
>  #


--
Alex Bennée

Re: [Qemu-devel] [PATCH 3/6] tests/qemu-iotests: Do not hard-code the path to bash

[Alex Bennée]

Thomas Huth <thuth@redhat.com> writes:

> bash is installed in a different directory on non-Linux systems like
> FreeBSD. Do not hard-code /bin/bash here so that the tests can run
> there, too.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tests/qemu-iotests/239 | 2 +-
>  tests/qemu-iotests/240 | 2 +-
>  tests/qemu-iotests/241 | 2 +-
>  tests/qemu-iotests/243 | 2 +-
>  tests/qemu-iotests/244 | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tests/qemu-iotests/239 b/tests/qemu-iotests/239
> index 6f085d573d..b0991ffe59 100755
> --- a/tests/qemu-iotests/239
> +++ b/tests/qemu-iotests/239
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  #
>  # Test case for dmg
>  #
> diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
> index 65cc3b39b1..d3e663ed65 100755
> --- a/tests/qemu-iotests/240
> +++ b/tests/qemu-iotests/240
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  #
>  # Test hot plugging and unplugging with iothreads
>  #
> diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241
> index 017a736aab..58b64ebf41 100755
> --- a/tests/qemu-iotests/241
> +++ b/tests/qemu-iotests/241
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  #
>  # Test qemu-nbd vs. unaligned images
>  #
> diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
> index 5838c6e89c..e563761307 100755
> --- a/tests/qemu-iotests/243
> +++ b/tests/qemu-iotests/243
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  #
>  # Test qcow2 preallocation
>  #
> diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
> index d8e7122305..13978f93d2 100755
> --- a/tests/qemu-iotests/244
> +++ b/tests/qemu-iotests/244
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
>  #
>  # Test qcow2 with external data files
>  #


--
Alex Bennée

[Qemu-devel] [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD

[Thomas Huth]

We are going to enable the qemu-iotests during "make check" again,
and for running the iotests, we need bash and gnu-sed.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .cirrus.yml | 4 ++--
 .travis.yml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 47ef5bc604..8326a3a4b1 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -7,7 +7,7 @@ freebsd_12_task:
     cpu: 8
     memory: 8G
   install_script: pkg install -y
-    bison curl cyrus-sasl git glib gmake gnutls
+    bash bison curl cyrus-sasl git glib gmake gnutls gsed
     nettle perl5 pixman pkgconf png usbredir
   script:
     - mkdir build
@@ -20,7 +20,7 @@ macos_task:
   osx_instance:
     image: mojave-base
   install_script:
-    - brew install pkg-config python glib pixman make sdl2
+    - brew install pkg-config python gnu-sed glib pixman make sdl2
   script:
     - ./configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }
     - gmake -j$(sysctl -n hw.ncpu)
diff --git a/.travis.yml b/.travis.yml
index 2e06aee9d0..ba94644192 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,7 @@ addons:
     packages:
       - glib
       - pixman
+      - gnu-sed
 
 
 # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
-- 
2.21.0

[Qemu-devel] [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD

[Thomas Huth]

We are going to enable the qemu-iotests during "make check" again,
and for running the iotests, we need bash and gnu-sed.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .cirrus.yml | 4 ++--
 .travis.yml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 47ef5bc604..8326a3a4b1 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -7,7 +7,7 @@ freebsd_12_task:
     cpu: 8
     memory: 8G
   install_script: pkg install -y
-    bison curl cyrus-sasl git glib gmake gnutls
+    bash bison curl cyrus-sasl git glib gmake gnutls gsed
     nettle perl5 pixman pkgconf png usbredir
   script:
     - mkdir build
@@ -20,7 +20,7 @@ macos_task:
   osx_instance:
     image: mojave-base
   install_script:
-    - brew install pkg-config python glib pixman make sdl2
+    - brew install pkg-config python gnu-sed glib pixman make sdl2
   script:
     - ./configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }
     - gmake -j$(sysctl -n hw.ncpu)
diff --git a/.travis.yml b/.travis.yml
index 2e06aee9d0..ba94644192 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,7 @@ addons:
     packages:
       - glib
       - pixman
+      - gnu-sed
 
 
 # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
-- 
2.21.0

Re: [Qemu-devel] [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD

[Wainer dos Santos Moschetta]

Hello Thomas,

On 04/24/2019 07:37 AM, Thomas Huth wrote:
> We are going to enable the qemu-iotests during "make check" again,
> and for running the iotests, we need bash and gnu-sed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   .cirrus.yml | 4 ++--
>   .travis.yml | 1 +
>   2 files changed, 3 insertions(+), 2 deletions(-)

It needs to get the Freebsd image [1] updated too, in order to `make 
BUILD_TARGET=check vm-build-freebsd` passes. Here it failed with:
---
env: bash: No such file or directory
gmake: *** [/var/tmp/qemu-test.6OlDFH/tests/Makefile.include:1101: 
check-tests/qemu-iotests-quick.sh] Error 1
gmake: *** Waiting for unfinished jobs....
---

I'm not sure about the netbsd and openbsd images, they might need bash 
and gnu-sed as well.

[1] http://download.patchew.org/freebsd-11.1-amd64.img.xz

- Wainer

>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index 47ef5bc604..8326a3a4b1 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -7,7 +7,7 @@ freebsd_12_task:
>       cpu: 8
>       memory: 8G
>     install_script: pkg install -y
> -    bison curl cyrus-sasl git glib gmake gnutls
> +    bash bison curl cyrus-sasl git glib gmake gnutls gsed
>       nettle perl5 pixman pkgconf png usbredir
>     script:
>       - mkdir build
> @@ -20,7 +20,7 @@ macos_task:
>     osx_instance:
>       image: mojave-base
>     install_script:
> -    - brew install pkg-config python glib pixman make sdl2
> +    - brew install pkg-config python gnu-sed glib pixman make sdl2
>     script:
>       - ./configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }
>       - gmake -j$(sysctl -n hw.ncpu)
> diff --git a/.travis.yml b/.travis.yml
> index 2e06aee9d0..ba94644192 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -42,6 +42,7 @@ addons:
>       packages:
>         - glib
>         - pixman
> +      - gnu-sed
>   
>   
>   # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu

Re: [Qemu-devel] [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD

[Wainer dos Santos Moschetta]

Hello Thomas,

On 04/24/2019 07:37 AM, Thomas Huth wrote:
> We are going to enable the qemu-iotests during "make check" again,
> and for running the iotests, we need bash and gnu-sed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   .cirrus.yml | 4 ++--
>   .travis.yml | 1 +
>   2 files changed, 3 insertions(+), 2 deletions(-)

It needs to get the Freebsd image [1] updated too, in order to `make 
BUILD_TARGET=check vm-build-freebsd` passes. Here it failed with:
---
env: bash: No such file or directory
gmake: *** [/var/tmp/qemu-test.6OlDFH/tests/Makefile.include:1101: 
check-tests/qemu-iotests-quick.sh] Error 1
gmake: *** Waiting for unfinished jobs....
---

I'm not sure about the netbsd and openbsd images, they might need bash 
and gnu-sed as well.

[1] http://download.patchew.org/freebsd-11.1-amd64.img.xz

- Wainer

>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index 47ef5bc604..8326a3a4b1 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -7,7 +7,7 @@ freebsd_12_task:
>       cpu: 8
>       memory: 8G
>     install_script: pkg install -y
> -    bison curl cyrus-sasl git glib gmake gnutls
> +    bash bison curl cyrus-sasl git glib gmake gnutls gsed
>       nettle perl5 pixman pkgconf png usbredir
>     script:
>       - mkdir build
> @@ -20,7 +20,7 @@ macos_task:
>     osx_instance:
>       image: mojave-base
>     install_script:
> -    - brew install pkg-config python glib pixman make sdl2
> +    - brew install pkg-config python gnu-sed glib pixman make sdl2
>     script:
>       - ./configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }
>       - gmake -j$(sysctl -n hw.ncpu)
> diff --git a/.travis.yml b/.travis.yml
> index 2e06aee9d0..ba94644192 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -42,6 +42,7 @@ addons:
>       packages:
>         - glib
>         - pixman
> +      - gnu-sed
>   
>   
>   # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu

Re: [Qemu-devel] [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD

[Thomas Huth]

On 24/04/2019 23.29, Wainer dos Santos Moschetta wrote:
> Hello Thomas,
> 
> On 04/24/2019 07:37 AM, Thomas Huth wrote:
>> We are going to enable the qemu-iotests during "make check" again,
>> and for running the iotests, we need bash and gnu-sed.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   .cirrus.yml | 4 ++--
>>   .travis.yml | 1 +
>>   2 files changed, 3 insertions(+), 2 deletions(-)
> 
> It needs to get the Freebsd image [1] updated too, in order to `make
> BUILD_TARGET=check vm-build-freebsd` passes. Here it failed with:
> ---
> env: bash: No such file or directory
> gmake: *** [/var/tmp/qemu-test.6OlDFH/tests/Makefile.include:1101:
> check-tests/qemu-iotests-quick.sh] Error 1
> gmake: *** Waiting for unfinished jobs....
> ---
> 
> I'm not sure about the netbsd and openbsd images, they might need bash
> and gnu-sed as well.

D'oh! Does anybody know what are the correct steps to update these images?

 Thomas

Re: [Qemu-devel] [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD

[Thomas Huth]

On 24/04/2019 23.29, Wainer dos Santos Moschetta wrote:
> Hello Thomas,
> 
> On 04/24/2019 07:37 AM, Thomas Huth wrote:
>> We are going to enable the qemu-iotests during "make check" again,
>> and for running the iotests, we need bash and gnu-sed.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   .cirrus.yml | 4 ++--
>>   .travis.yml | 1 +
>>   2 files changed, 3 insertions(+), 2 deletions(-)
> 
> It needs to get the Freebsd image [1] updated too, in order to `make
> BUILD_TARGET=check vm-build-freebsd` passes. Here it failed with:
> ---
> env: bash: No such file or directory
> gmake: *** [/var/tmp/qemu-test.6OlDFH/tests/Makefile.include:1101:
> check-tests/qemu-iotests-quick.sh] Error 1
> gmake: *** Waiting for unfinished jobs....
> ---
> 
> I'm not sure about the netbsd and openbsd images, they might need bash
> and gnu-sed as well.

D'oh! Does anybody know what are the correct steps to update these images?

 Thomas

Re: [Qemu-devel] [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD

[Laszlo Ersek]

(+Dan)

On 04/25/19 08:00, Thomas Huth wrote:
> On 24/04/2019 23.29, Wainer dos Santos Moschetta wrote:
>> Hello Thomas,
>>
>> On 04/24/2019 07:37 AM, Thomas Huth wrote:
>>> We are going to enable the qemu-iotests during "make check" again,
>>> and for running the iotests, we need bash and gnu-sed.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>   .cirrus.yml | 4 ++--
>>>   .travis.yml | 1 +
>>>   2 files changed, 3 insertions(+), 2 deletions(-)
>>
>> It needs to get the Freebsd image [1] updated too, in order to `make
>> BUILD_TARGET=check vm-build-freebsd` passes. Here it failed with:
>> ---
>> env: bash: No such file or directory
>> gmake: *** [/var/tmp/qemu-test.6OlDFH/tests/Makefile.include:1101:
>> check-tests/qemu-iotests-quick.sh] Error 1
>> gmake: *** Waiting for unfinished jobs....
>> ---
>>
>> I'm not sure about the netbsd and openbsd images, they might need bash
>> and gnu-sed as well.
> 
> D'oh! Does anybody know what are the correct steps to update these images?

(1) make the OPENBSD subsystem maintainer care

(2) update <https://wiki.qemu.org/Hosts/BSD>

(3) download the image from download.patchew.org, boot it and update it

(4) upload the image to download.patchew.org

(5) update the "tests/vm/openbsd" script in the QEMU tree in sync
(checksums, commands etc)


I'm fairly sure (1) is necessary; the rest is more or less guesswork on
my part.

Thanks
Laszlo

Re: [Qemu-devel] [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD

[Laszlo Ersek]

(+Dan)

On 04/25/19 08:00, Thomas Huth wrote:
> On 24/04/2019 23.29, Wainer dos Santos Moschetta wrote:
>> Hello Thomas,
>>
>> On 04/24/2019 07:37 AM, Thomas Huth wrote:
>>> We are going to enable the qemu-iotests during "make check" again,
>>> and for running the iotests, we need bash and gnu-sed.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>   .cirrus.yml | 4 ++--
>>>   .travis.yml | 1 +
>>>   2 files changed, 3 insertions(+), 2 deletions(-)
>>
>> It needs to get the Freebsd image [1] updated too, in order to `make
>> BUILD_TARGET=check vm-build-freebsd` passes. Here it failed with:
>> ---
>> env: bash: No such file or directory
>> gmake: *** [/var/tmp/qemu-test.6OlDFH/tests/Makefile.include:1101:
>> check-tests/qemu-iotests-quick.sh] Error 1
>> gmake: *** Waiting for unfinished jobs....
>> ---
>>
>> I'm not sure about the netbsd and openbsd images, they might need bash
>> and gnu-sed as well.
> 
> D'oh! Does anybody know what are the correct steps to update these images?

(1) make the OPENBSD subsystem maintainer care

(2) update <https://wiki.qemu.org/Hosts/BSD>

(3) download the image from download.patchew.org, boot it and update it

(4) upload the image to download.patchew.org

(5) update the "tests/vm/openbsd" script in the QEMU tree in sync
(checksums, commands etc)


I'm fairly sure (1) is necessary; the rest is more or less guesswork on
my part.

Thanks
Laszlo

[Qemu-devel] Update *BSD images with gnu-sed and bash (was: [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD)

[Thomas Huth]

On 26/04/2019 18.43, Laszlo Ersek wrote:
> On 04/25/19 08:00, Thomas Huth wrote:
>> On 24/04/2019 23.29, Wainer dos Santos Moschetta wrote:
>>> Hello Thomas,
>>>
>>> On 04/24/2019 07:37 AM, Thomas Huth wrote:
>>>> We are going to enable the qemu-iotests during "make check" again,
>>>> and for running the iotests, we need bash and gnu-sed.
>>> [...]
>>> It needs to get the Freebsd image [1] updated too, in order to `make
>>> BUILD_TARGET=check vm-build-freebsd` passes. Here it failed with:
>>> ---
>>> env: bash: No such file or directory
>>> gmake: *** [/var/tmp/qemu-test.6OlDFH/tests/Makefile.include:1101:
>>> check-tests/qemu-iotests-quick.sh] Error 1
>>> gmake: *** Waiting for unfinished jobs....
>>> ---
>>>
>>> I'm not sure about the netbsd and openbsd images, they might need bash
>>> and gnu-sed as well.
>>
>> D'oh! Does anybody know what are the correct steps to update these images?
> 
> (1) make the OPENBSD subsystem maintainer care
> 
> (2) update <https://wiki.qemu.org/Hosts/BSD>
> 
> (3) download the image from download.patchew.org, boot it and update it
> 
> (4) upload the image to download.patchew.org
> 
> (5) update the "tests/vm/openbsd" script in the QEMU tree in sync
> (checksums, commands etc)

 Ed, Li-Wen,

any chance you could help with updating the FreeBSD image and the
tests/vm/freebsd script, so that we get more test covarage here?

 Kamil,

could you maybe help with the NetBSD image and the tests/vm/netbsd script?

 Brad,

could you please help with the OpenBSD image and the tests/vm/openbsd
script?

I think it would also be good to update the images to the latest
released versions, too...

And IIRC, there was also a thread recently that it would also be good to
have the "xz" tool in all of these images, too...

 Thanks,
  Thomas

Re: [Qemu-devel] Update *BSD images with gnu-sed and bash (was: [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD)

[Gerd Hoffmann]

> >> D'oh! Does anybody know what are the correct steps to update these images?
> > 
> > (1) make the OPENBSD subsystem maintainer care
> > 
> > (2) update <https://wiki.qemu.org/Hosts/BSD>
> > 
> > (3) download the image from download.patchew.org, boot it and update it
> > 
> > (4) upload the image to download.patchew.org
> > 
> > (5) update the "tests/vm/openbsd" script in the QEMU tree in sync
> > (checksums, commands etc)
> 
>  Ed, Li-Wen,
> 
> any chance you could help with updating the FreeBSD image and the
> tests/vm/freebsd script, so that we get more test covarage here?
> 
>  Kamil,
> 
> could you maybe help with the NetBSD image and the tests/vm/netbsd script?
> 
>  Brad,
> 
> could you please help with the OpenBSD image and the tests/vm/openbsd
> script?
> 
> I think it would also be good to update the images to the latest
> released versions, too...

FYI:  I'm working on revamping the tests/vm setup, creating the images
scripted on the developer machine.  That'll take download.patchew.org
out of the loop and makes adding packages as easy as patching a docker
script.

Going slower than I want due to /me being busy with other stuff.
Sneak preview at:
	https://git.kraxel.org/cgit/qemu/log/?h=sirius/test-vm-install

cheers,
  Gerd

Re: [Qemu-devel] Update *BSD images with gnu-sed and bash (was: [PATCH 4/6] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD)

[Thomas Huth]

On 07/05/2019 10.32, Gerd Hoffmann wrote:
>>>> D'oh! Does anybody know what are the correct steps to update these images?
>>>
>>> (1) make the OPENBSD subsystem maintainer care
>>>
>>> (2) update <https://wiki.qemu.org/Hosts/BSD>
>>>
>>> (3) download the image from download.patchew.org, boot it and update it
>>>
>>> (4) upload the image to download.patchew.org
>>>
>>> (5) update the "tests/vm/openbsd" script in the QEMU tree in sync
>>> (checksums, commands etc)
>>
>>  Ed, Li-Wen,
>>
>> any chance you could help with updating the FreeBSD image and the
>> tests/vm/freebsd script, so that we get more test covarage here?
>>
>>  Kamil,
>>
>> could you maybe help with the NetBSD image and the tests/vm/netbsd script?
>>
>>  Brad,
>>
>> could you please help with the OpenBSD image and the tests/vm/openbsd
>> script?
>>
>> I think it would also be good to update the images to the latest
>> released versions, too...
> 
> FYI:  I'm working on revamping the tests/vm setup, creating the images
> scripted on the developer machine.  That'll take download.patchew.org
> out of the loop and makes adding packages as easy as patching a docker
> script.

Cool, that sounds like the best solution, indeed!

 Thanks,
  Thomas

Re: [Qemu-devel] Update *BSD images with gnu-sed and bash

[Kamil Rytarowski]

[-- Attachment #1: Type: text/plain, Size: 2017 bytes --]

On 06.05.2019 12:12, Thomas Huth wrote:
> On 26/04/2019 18.43, Laszlo Ersek wrote:
>> On 04/25/19 08:00, Thomas Huth wrote:
>>> On 24/04/2019 23.29, Wainer dos Santos Moschetta wrote:
>>>> Hello Thomas,
>>>>
>>>> On 04/24/2019 07:37 AM, Thomas Huth wrote:
>>>>> We are going to enable the qemu-iotests during "make check" again,
>>>>> and for running the iotests, we need bash and gnu-sed.
>>>> [...]
>>>> It needs to get the Freebsd image [1] updated too, in order to `make
>>>> BUILD_TARGET=check vm-build-freebsd` passes. Here it failed with:
>>>> ---
>>>> env: bash: No such file or directory
>>>> gmake: *** [/var/tmp/qemu-test.6OlDFH/tests/Makefile.include:1101:
>>>> check-tests/qemu-iotests-quick.sh] Error 1
>>>> gmake: *** Waiting for unfinished jobs....
>>>> ---
>>>>
>>>> I'm not sure about the netbsd and openbsd images, they might need bash
>>>> and gnu-sed as well.
>>>
>>> D'oh! Does anybody know what are the correct steps to update these images?
>>
>> (1) make the OPENBSD subsystem maintainer care
>>
>> (2) update <https://wiki.qemu.org/Hosts/BSD>
>>
>> (3) download the image from download.patchew.org, boot it and update it
>>
>> (4) upload the image to download.patchew.org
>>
>> (5) update the "tests/vm/openbsd" script in the QEMU tree in sync
>> (checksums, commands etc)
> 
>  Ed, Li-Wen,
> 
> any chance you could help with updating the FreeBSD image and the
> tests/vm/freebsd script, so that we get more test covarage here?
> 
>  Kamil,
> 
> could you maybe help with the NetBSD image and the tests/vm/netbsd script?
> 

Please be more specific what am I expected to do.

>  Brad,
> 
> could you please help with the OpenBSD image and the tests/vm/openbsd
> script?
> 
> I think it would also be good to update the images to the latest
> released versions, too...
> 
> And IIRC, there was also a thread recently that it would also be good to
> have the "xz" tool in all of these images, too...
> 
>  Thanks,
>   Thomas
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 850 bytes --]

Re: [Qemu-devel] Update *BSD images with gnu-sed and bash

[Thomas Huth]

[-- Attachment #1: Type: text/plain, Size: 1004 bytes --]

On 08/05/2019 09.06, Kamil Rytarowski wrote:
> On 06.05.2019 12:12, Thomas Huth wrote:
[...]
>>  Kamil,
>>
>> could you maybe help with the NetBSD image and the tests/vm/netbsd script?
>>
> 
> Please be more specific what am I expected to do.

We have some VMs (including NetBSD) available that are used during
Peter's regression tests when somebody sends him a PULL requests. You
can run them also locally with:

 make BUILD_TARGET=check vm-build-netbsd

From time to time, we've got to update these images, either to a newer
version or to add some missing packages (like bash and gnu-sed in this
case).
However, many people (including me) don't have a clue about the various
*BSD flavours, so also no clue about how to update these images easily.
That's why I was hoping you could help here.

But looks like Gerd is already working on a way to generate these images
in a more automated way, so let's hope that he'll find some spare time
to finish that work soon.

 Thomas


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [Qemu-devel] Update *BSD images with gnu-sed and bash

[Kamil Rytarowski]

[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]

On 08.05.2019 10:07, Thomas Huth wrote:
> On 08/05/2019 09.06, Kamil Rytarowski wrote:
>> On 06.05.2019 12:12, Thomas Huth wrote:
> [...]
>>>  Kamil,
>>>
>>> could you maybe help with the NetBSD image and the tests/vm/netbsd script?
>>>
>>
>> Please be more specific what am I expected to do.
> 
> We have some VMs (including NetBSD) available that are used during
> Peter's regression tests when somebody sends him a PULL requests. You
> can run them also locally with:
> 
>  make BUILD_TARGET=check vm-build-netbsd
> 
> From time to time, we've got to update these images, either to a newer
> version or to add some missing packages (like bash and gnu-sed in this
> case).

The process has been documented on wiki.

https://wiki.qemu.org/Hosts/BSD#NetBSD

> However, many people (including me) don't have a clue about the various
> *BSD flavours, so also no clue about how to update these images easily.
> That's why I was hoping you could help here.
> 
> But looks like Gerd is already working on a way to generate these images
> in a more automated way, so let's hope that he'll find some spare time
> to finish that work soon.
> 

I recommend to upgrade to 8.0.

One extra step is to disable PaX MPROTECT (tcg violates W^X):

This should be addressed in qemu with an extension flag to
mmap(2)/mremap(2). I still have this on my TODO list.

sysctl -w security.pax.mprotect.enabled=1

NetBSD 9.0 will be released sooner than later and soon after that
NetBSD-7.x will be EOL.

>  Thomas
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 850 bytes --]

[Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Thomas Huth]

People often forget to run the iotests before submitting patches or
pull requests - this is likely due to the fact that we do not run the
tests during our mandatory "make check" tests yet. Now that we've got
a new "ci" group of iotests that should be fine to run in every environ-
ment, it should be OK to enable the iotests during "make check" again.
Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
script, and only use the former "quick" group (that contains some tests
that are failing in some environments) when the user decided to run
"make check SPEED=thorough" or something similar.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/Makefile.include      |  2 +-
 tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 36fc73fef5..eb6a7a41e2 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -1168,7 +1168,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
 check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-tests/qapi-schema/doc-good.texi
 check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
 check-block: $(patsubst %,check-%, $(check-block-y))
-check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
+check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree check-block
 check-clean:
 	rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
 	rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
index 0e554bb972..416b3fc48b 100755
--- a/tests/qemu-iotests-quick.sh
+++ b/tests/qemu-iotests-quick.sh
@@ -1,8 +1,23 @@
 #!/bin/sh
 
+# Honor the SPEED environment variable, just like we do it for the qtests.
+# The default is to run all tests that still work fine in a CI environments,
+# but if the user set SPEED=slow or SPEED=thorough, we also run all other
+# tests that are still marked as "quick"
+if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
+    group=quick
+else
+    group=ci
+fi
+
+if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
+    echo "No qemu-system binary available. Skipped qemu-iotests."
+    exit 0
+fi
+
 cd tests/qemu-iotests
 
 ret=0
-TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g quick || ret=1
+TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g "$group" || ret=1
 
 exit $ret
-- 
2.21.0

[Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Thomas Huth]

People often forget to run the iotests before submitting patches or
pull requests - this is likely due to the fact that we do not run the
tests during our mandatory "make check" tests yet. Now that we've got
a new "ci" group of iotests that should be fine to run in every environ-
ment, it should be OK to enable the iotests during "make check" again.
Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
script, and only use the former "quick" group (that contains some tests
that are failing in some environments) when the user decided to run
"make check SPEED=thorough" or something similar.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/Makefile.include      |  2 +-
 tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 36fc73fef5..eb6a7a41e2 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -1168,7 +1168,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
 check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-tests/qapi-schema/doc-good.texi
 check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
 check-block: $(patsubst %,check-%, $(check-block-y))
-check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
+check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree check-block
 check-clean:
 	rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
 	rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
index 0e554bb972..416b3fc48b 100755
--- a/tests/qemu-iotests-quick.sh
+++ b/tests/qemu-iotests-quick.sh
@@ -1,8 +1,23 @@
 #!/bin/sh
 
+# Honor the SPEED environment variable, just like we do it for the qtests.
+# The default is to run all tests that still work fine in a CI environments,
+# but if the user set SPEED=slow or SPEED=thorough, we also run all other
+# tests that are still marked as "quick"
+if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
+    group=quick
+else
+    group=ci
+fi
+
+if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
+    echo "No qemu-system binary available. Skipped qemu-iotests."
+    exit 0
+fi
+
 cd tests/qemu-iotests
 
 ret=0
-TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g quick || ret=1
+TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g "$group" || ret=1
 
 exit $ret
-- 
2.21.0

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Daniel P. Berrangé]

On Wed, Apr 24, 2019 at 12:37:46PM +0200, Thomas Huth wrote:
> People often forget to run the iotests before submitting patches or
> pull requests - this is likely due to the fact that we do not run the
> tests during our mandatory "make check" tests yet. Now that we've got
> a new "ci" group of iotests that should be fine to run in every environ-
> ment, it should be OK to enable the iotests during "make check" again.
> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
> script, and only use the former "quick" group (that contains some tests
> that are failing in some environments) when the user decided to run
> "make check SPEED=thorough" or something similar.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/Makefile.include      |  2 +-
>  tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>  2 files changed, 17 insertions(+), 2 deletions(-)

> diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
> index 0e554bb972..416b3fc48b 100755
> --- a/tests/qemu-iotests-quick.sh
> +++ b/tests/qemu-iotests-quick.sh

s/-quick//  perhaps, since it no longer only runs the "quick" tests.

> @@ -1,8 +1,23 @@
>  #!/bin/sh
>  
> +# Honor the SPEED environment variable, just like we do it for the qtests.
> +# The default is to run all tests that still work fine in a CI environments,
> +# but if the user set SPEED=slow or SPEED=thorough, we also run all other
> +# tests that are still marked as "quick"
> +if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
> +    group=quick

When user asks for "slow" tests we run the "quick" tests, which
presumably implies...

> +else
> +    group=ci

..."ci" is quicker than the "quick"  tests !

Confused ? We certainly try to ensure that you will be :-)

> +fi
> +
> +if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
> +    echo "No qemu-system binary available. Skipped qemu-iotests."
> +    exit 0
> +fi
> +
>  cd tests/qemu-iotests
>  
>  ret=0
> -TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g quick || ret=1
> +TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g "$group" || ret=1


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Daniel P. Berrangé]

On Wed, Apr 24, 2019 at 12:37:46PM +0200, Thomas Huth wrote:
> People often forget to run the iotests before submitting patches or
> pull requests - this is likely due to the fact that we do not run the
> tests during our mandatory "make check" tests yet. Now that we've got
> a new "ci" group of iotests that should be fine to run in every environ-
> ment, it should be OK to enable the iotests during "make check" again.
> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
> script, and only use the former "quick" group (that contains some tests
> that are failing in some environments) when the user decided to run
> "make check SPEED=thorough" or something similar.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/Makefile.include      |  2 +-
>  tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>  2 files changed, 17 insertions(+), 2 deletions(-)

> diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
> index 0e554bb972..416b3fc48b 100755
> --- a/tests/qemu-iotests-quick.sh
> +++ b/tests/qemu-iotests-quick.sh

s/-quick//  perhaps, since it no longer only runs the "quick" tests.

> @@ -1,8 +1,23 @@
>  #!/bin/sh
>  
> +# Honor the SPEED environment variable, just like we do it for the qtests.
> +# The default is to run all tests that still work fine in a CI environments,
> +# but if the user set SPEED=slow or SPEED=thorough, we also run all other
> +# tests that are still marked as "quick"
> +if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
> +    group=quick

When user asks for "slow" tests we run the "quick" tests, which
presumably implies...

> +else
> +    group=ci

..."ci" is quicker than the "quick"  tests !

Confused ? We certainly try to ensure that you will be :-)

> +fi
> +
> +if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
> +    echo "No qemu-system binary available. Skipped qemu-iotests."
> +    exit 0
> +fi
> +
>  cd tests/qemu-iotests
>  
>  ret=0
> -TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g quick || ret=1
> +TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g "$group" || ret=1


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Thomas Huth]

On 24/04/2019 12.48, Daniel P. Berrangé wrote:
> On Wed, Apr 24, 2019 at 12:37:46PM +0200, Thomas Huth wrote:
>> People often forget to run the iotests before submitting patches or
>> pull requests - this is likely due to the fact that we do not run the
>> tests during our mandatory "make check" tests yet. Now that we've got
>> a new "ci" group of iotests that should be fine to run in every environ-
>> ment, it should be OK to enable the iotests during "make check" again.
>> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
>> script, and only use the former "quick" group (that contains some tests
>> that are failing in some environments) when the user decided to run
>> "make check SPEED=thorough" or something similar.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  tests/Makefile.include      |  2 +-
>>  tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>>  2 files changed, 17 insertions(+), 2 deletions(-)
> 
>> diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
>> index 0e554bb972..416b3fc48b 100755
>> --- a/tests/qemu-iotests-quick.sh
>> +++ b/tests/qemu-iotests-quick.sh
> 
> s/-quick//  perhaps, since it no longer only runs the "quick" tests.
> 
>> @@ -1,8 +1,23 @@
>>  #!/bin/sh
>>  
>> +# Honor the SPEED environment variable, just like we do it for the qtests.
>> +# The default is to run all tests that still work fine in a CI environments,
>> +# but if the user set SPEED=slow or SPEED=thorough, we also run all other
>> +# tests that are still marked as "quick"
>> +if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
>> +    group=quick
> 
> When user asks for "slow" tests we run the "quick" tests, which
> presumably implies...
> 
>> +else
>> +    group=ci
> 
> ..."ci" is quicker than the "quick"  tests !
> 
> Confused ? We certainly try to ensure that you will be :-)

... and there is also tests/check-block.sh (which is not used by "make
check-block", by the way, but still talks about "make check-block"),
which is even slower than the "ci" and "quick" group...

I guess that could be cleaned up, too (why do we need two scripts?) ...
just not sure how the final result should look like and if it should be
part of this patch series or rather something separate. Max, Kevin, what
do you think?

Maybe we should merge the two scripts, and depending on the SPEED
variable, we run:

 quick => "ci" group
 thorough => "quick" group
 slow => old behaviour of the check-block.sh script

?

 Thomas

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Thomas Huth]

On 24/04/2019 12.48, Daniel P. Berrangé wrote:
> On Wed, Apr 24, 2019 at 12:37:46PM +0200, Thomas Huth wrote:
>> People often forget to run the iotests before submitting patches or
>> pull requests - this is likely due to the fact that we do not run the
>> tests during our mandatory "make check" tests yet. Now that we've got
>> a new "ci" group of iotests that should be fine to run in every environ-
>> ment, it should be OK to enable the iotests during "make check" again.
>> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
>> script, and only use the former "quick" group (that contains some tests
>> that are failing in some environments) when the user decided to run
>> "make check SPEED=thorough" or something similar.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  tests/Makefile.include      |  2 +-
>>  tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>>  2 files changed, 17 insertions(+), 2 deletions(-)
> 
>> diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
>> index 0e554bb972..416b3fc48b 100755
>> --- a/tests/qemu-iotests-quick.sh
>> +++ b/tests/qemu-iotests-quick.sh
> 
> s/-quick//  perhaps, since it no longer only runs the "quick" tests.
> 
>> @@ -1,8 +1,23 @@
>>  #!/bin/sh
>>  
>> +# Honor the SPEED environment variable, just like we do it for the qtests.
>> +# The default is to run all tests that still work fine in a CI environments,
>> +# but if the user set SPEED=slow or SPEED=thorough, we also run all other
>> +# tests that are still marked as "quick"
>> +if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
>> +    group=quick
> 
> When user asks for "slow" tests we run the "quick" tests, which
> presumably implies...
> 
>> +else
>> +    group=ci
> 
> ..."ci" is quicker than the "quick"  tests !
> 
> Confused ? We certainly try to ensure that you will be :-)

... and there is also tests/check-block.sh (which is not used by "make
check-block", by the way, but still talks about "make check-block"),
which is even slower than the "ci" and "quick" group...

I guess that could be cleaned up, too (why do we need two scripts?) ...
just not sure how the final result should look like and if it should be
part of this patch series or rather something separate. Max, Kevin, what
do you think?

Maybe we should merge the two scripts, and depending on the SPEED
variable, we run:

 quick => "ci" group
 thorough => "quick" group
 slow => old behaviour of the check-block.sh script

?

 Thomas

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Vladimir Sementsov-Ogievskiy]

24.04.2019 13:59, Thomas Huth wrote:
> On 24/04/2019 12.48, Daniel P. Berrangé wrote:
>> On Wed, Apr 24, 2019 at 12:37:46PM +0200, Thomas Huth wrote:
>>> People often forget to run the iotests before submitting patches or
>>> pull requests - this is likely due to the fact that we do not run the
>>> tests during our mandatory "make check" tests yet. Now that we've got
>>> a new "ci" group of iotests that should be fine to run in every environ-
>>> ment, it should be OK to enable the iotests during "make check" again.
>>> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
>>> script, and only use the former "quick" group (that contains some tests
>>> that are failing in some environments) when the user decided to run
>>> "make check SPEED=thorough" or something similar.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>   tests/Makefile.include      |  2 +-
>>>   tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>>>   2 files changed, 17 insertions(+), 2 deletions(-)
>>
>>> diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
>>> index 0e554bb972..416b3fc48b 100755
>>> --- a/tests/qemu-iotests-quick.sh
>>> +++ b/tests/qemu-iotests-quick.sh
>>
>> s/-quick//  perhaps, since it no longer only runs the "quick" tests.
>>
>>> @@ -1,8 +1,23 @@
>>>   #!/bin/sh
>>>   
>>> +# Honor the SPEED environment variable, just like we do it for the qtests.
>>> +# The default is to run all tests that still work fine in a CI environments,
>>> +# but if the user set SPEED=slow or SPEED=thorough, we also run all other
>>> +# tests that are still marked as "quick"
>>> +if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
>>> +    group=quick
>>
>> When user asks for "slow" tests we run the "quick" tests, which
>> presumably implies...
>>
>>> +else
>>> +    group=ci
>>
>> ..."ci" is quicker than the "quick"  tests !
>>
>> Confused ? We certainly try to ensure that you will be :-)
> 
> ... and there is also tests/check-block.sh (which is not used by "make
> check-block", by the way, but still talks about "make check-block"),
> which is even slower than the "ci" and "quick" group...
> 
> I guess that could be cleaned up, too (why do we need two scripts?) ...
> just not sure how the final result should look like and if it should be
> part of this patch series or rather something separate. Max, Kevin, what
> do you think?
> 
> Maybe we should merge the two scripts, and depending on the SPEED
> variable, we run:
> 
>   quick => "ci" group
>   thorough => "quick" group
>   slow => old behaviour of the check-block.sh script

May be, instead of SPEED, introduce GROUP variable? To make it plain
ci -> ci
quick -> quick
nothing -> default old behavior
?

> 
> ?
> 
>   Thomas
> 


-- 
Best regards,
Vladimir

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Vladimir Sementsov-Ogievskiy]

24.04.2019 13:59, Thomas Huth wrote:
> On 24/04/2019 12.48, Daniel P. Berrangé wrote:
>> On Wed, Apr 24, 2019 at 12:37:46PM +0200, Thomas Huth wrote:
>>> People often forget to run the iotests before submitting patches or
>>> pull requests - this is likely due to the fact that we do not run the
>>> tests during our mandatory "make check" tests yet. Now that we've got
>>> a new "ci" group of iotests that should be fine to run in every environ-
>>> ment, it should be OK to enable the iotests during "make check" again.
>>> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
>>> script, and only use the former "quick" group (that contains some tests
>>> that are failing in some environments) when the user decided to run
>>> "make check SPEED=thorough" or something similar.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>   tests/Makefile.include      |  2 +-
>>>   tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>>>   2 files changed, 17 insertions(+), 2 deletions(-)
>>
>>> diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
>>> index 0e554bb972..416b3fc48b 100755
>>> --- a/tests/qemu-iotests-quick.sh
>>> +++ b/tests/qemu-iotests-quick.sh
>>
>> s/-quick//  perhaps, since it no longer only runs the "quick" tests.
>>
>>> @@ -1,8 +1,23 @@
>>>   #!/bin/sh
>>>   
>>> +# Honor the SPEED environment variable, just like we do it for the qtests.
>>> +# The default is to run all tests that still work fine in a CI environments,
>>> +# but if the user set SPEED=slow or SPEED=thorough, we also run all other
>>> +# tests that are still marked as "quick"
>>> +if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
>>> +    group=quick
>>
>> When user asks for "slow" tests we run the "quick" tests, which
>> presumably implies...
>>
>>> +else
>>> +    group=ci
>>
>> ..."ci" is quicker than the "quick"  tests !
>>
>> Confused ? We certainly try to ensure that you will be :-)
> 
> ... and there is also tests/check-block.sh (which is not used by "make
> check-block", by the way, but still talks about "make check-block"),
> which is even slower than the "ci" and "quick" group...
> 
> I guess that could be cleaned up, too (why do we need two scripts?) ...
> just not sure how the final result should look like and if it should be
> part of this patch series or rather something separate. Max, Kevin, what
> do you think?
> 
> Maybe we should merge the two scripts, and depending on the SPEED
> variable, we run:
> 
>   quick => "ci" group
>   thorough => "quick" group
>   slow => old behaviour of the check-block.sh script

May be, instead of SPEED, introduce GROUP variable? To make it plain
ci -> ci
quick -> quick
nothing -> default old behavior
?

> 
> ?
> 
>   Thomas
> 


-- 
Best regards,
Vladimir

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Daniel P. Berrangé]

On Wed, Apr 24, 2019 at 12:02:29PM +0000, Vladimir Sementsov-Ogievskiy wrote:
> 24.04.2019 13:59, Thomas Huth wrote:
> > On 24/04/2019 12.48, Daniel P. Berrangé wrote:
> >> On Wed, Apr 24, 2019 at 12:37:46PM +0200, Thomas Huth wrote:
> >>> People often forget to run the iotests before submitting patches or
> >>> pull requests - this is likely due to the fact that we do not run the
> >>> tests during our mandatory "make check" tests yet. Now that we've got
> >>> a new "ci" group of iotests that should be fine to run in every environ-
> >>> ment, it should be OK to enable the iotests during "make check" again.
> >>> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
> >>> script, and only use the former "quick" group (that contains some tests
> >>> that are failing in some environments) when the user decided to run
> >>> "make check SPEED=thorough" or something similar.
> >>>
> >>> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >>> ---
> >>>   tests/Makefile.include      |  2 +-
> >>>   tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
> >>>   2 files changed, 17 insertions(+), 2 deletions(-)
> >>
> >>> diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
> >>> index 0e554bb972..416b3fc48b 100755
> >>> --- a/tests/qemu-iotests-quick.sh
> >>> +++ b/tests/qemu-iotests-quick.sh
> >>
> >> s/-quick//  perhaps, since it no longer only runs the "quick" tests.
> >>
> >>> @@ -1,8 +1,23 @@
> >>>   #!/bin/sh
> >>>   
> >>> +# Honor the SPEED environment variable, just like we do it for the qtests.
> >>> +# The default is to run all tests that still work fine in a CI environments,
> >>> +# but if the user set SPEED=slow or SPEED=thorough, we also run all other
> >>> +# tests that are still marked as "quick"
> >>> +if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
> >>> +    group=quick
> >>
> >> When user asks for "slow" tests we run the "quick" tests, which
> >> presumably implies...
> >>
> >>> +else
> >>> +    group=ci
> >>
> >> ..."ci" is quicker than the "quick"  tests !
> >>
> >> Confused ? We certainly try to ensure that you will be :-)
> > 
> > ... and there is also tests/check-block.sh (which is not used by "make
> > check-block", by the way, but still talks about "make check-block"),
> > which is even slower than the "ci" and "quick" group...
> > 
> > I guess that could be cleaned up, too (why do we need two scripts?) ...
> > just not sure how the final result should look like and if it should be
> > part of this patch series or rather something separate. Max, Kevin, what
> > do you think?
> > 
> > Maybe we should merge the two scripts, and depending on the SPEED
> > variable, we run:
> > 
> >   quick => "ci" group
> >   thorough => "quick" group
> >   slow => old behaviour of the check-block.sh script
> 
> May be, instead of SPEED, introduce GROUP variable? To make it plain

"$SPEED" is something used/defined by the gtester harness, so other bits
run by "make check" already honour that, hence it is desirable fro the
iotests todo the same.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Daniel P. Berrangé]

On Wed, Apr 24, 2019 at 12:02:29PM +0000, Vladimir Sementsov-Ogievskiy wrote:
> 24.04.2019 13:59, Thomas Huth wrote:
> > On 24/04/2019 12.48, Daniel P. Berrangé wrote:
> >> On Wed, Apr 24, 2019 at 12:37:46PM +0200, Thomas Huth wrote:
> >>> People often forget to run the iotests before submitting patches or
> >>> pull requests - this is likely due to the fact that we do not run the
> >>> tests during our mandatory "make check" tests yet. Now that we've got
> >>> a new "ci" group of iotests that should be fine to run in every environ-
> >>> ment, it should be OK to enable the iotests during "make check" again.
> >>> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
> >>> script, and only use the former "quick" group (that contains some tests
> >>> that are failing in some environments) when the user decided to run
> >>> "make check SPEED=thorough" or something similar.
> >>>
> >>> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >>> ---
> >>>   tests/Makefile.include      |  2 +-
> >>>   tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
> >>>   2 files changed, 17 insertions(+), 2 deletions(-)
> >>
> >>> diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
> >>> index 0e554bb972..416b3fc48b 100755
> >>> --- a/tests/qemu-iotests-quick.sh
> >>> +++ b/tests/qemu-iotests-quick.sh
> >>
> >> s/-quick//  perhaps, since it no longer only runs the "quick" tests.
> >>
> >>> @@ -1,8 +1,23 @@
> >>>   #!/bin/sh
> >>>   
> >>> +# Honor the SPEED environment variable, just like we do it for the qtests.
> >>> +# The default is to run all tests that still work fine in a CI environments,
> >>> +# but if the user set SPEED=slow or SPEED=thorough, we also run all other
> >>> +# tests that are still marked as "quick"
> >>> +if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
> >>> +    group=quick
> >>
> >> When user asks for "slow" tests we run the "quick" tests, which
> >> presumably implies...
> >>
> >>> +else
> >>> +    group=ci
> >>
> >> ..."ci" is quicker than the "quick"  tests !
> >>
> >> Confused ? We certainly try to ensure that you will be :-)
> > 
> > ... and there is also tests/check-block.sh (which is not used by "make
> > check-block", by the way, but still talks about "make check-block"),
> > which is even slower than the "ci" and "quick" group...
> > 
> > I guess that could be cleaned up, too (why do we need two scripts?) ...
> > just not sure how the final result should look like and if it should be
> > part of this patch series or rather something separate. Max, Kevin, what
> > do you think?
> > 
> > Maybe we should merge the two scripts, and depending on the SPEED
> > variable, we run:
> > 
> >   quick => "ci" group
> >   thorough => "quick" group
> >   slow => old behaviour of the check-block.sh script
> 
> May be, instead of SPEED, introduce GROUP variable? To make it plain

"$SPEED" is something used/defined by the gtester harness, so other bits
run by "make check" already honour that, hence it is desirable fro the
iotests todo the same.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Vladimir Sementsov-Ogievskiy]

24.04.2019 15:13, Daniel P. Berrangé wrote:
> On Wed, Apr 24, 2019 at 12:02:29PM +0000, Vladimir Sementsov-Ogievskiy wrote:
>> 24.04.2019 13:59, Thomas Huth wrote:
>>> On 24/04/2019 12.48, Daniel P. Berrangé wrote:
>>>> On Wed, Apr 24, 2019 at 12:37:46PM +0200, Thomas Huth wrote:
>>>>> People often forget to run the iotests before submitting patches or
>>>>> pull requests - this is likely due to the fact that we do not run the
>>>>> tests during our mandatory "make check" tests yet. Now that we've got
>>>>> a new "ci" group of iotests that should be fine to run in every environ-
>>>>> ment, it should be OK to enable the iotests during "make check" again.
>>>>> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
>>>>> script, and only use the former "quick" group (that contains some tests
>>>>> that are failing in some environments) when the user decided to run
>>>>> "make check SPEED=thorough" or something similar.
>>>>>
>>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>>> ---
>>>>>    tests/Makefile.include      |  2 +-
>>>>>    tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>>>>>    2 files changed, 17 insertions(+), 2 deletions(-)
>>>>
>>>>> diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
>>>>> index 0e554bb972..416b3fc48b 100755
>>>>> --- a/tests/qemu-iotests-quick.sh
>>>>> +++ b/tests/qemu-iotests-quick.sh
>>>>
>>>> s/-quick//  perhaps, since it no longer only runs the "quick" tests.
>>>>
>>>>> @@ -1,8 +1,23 @@
>>>>>    #!/bin/sh
>>>>>    
>>>>> +# Honor the SPEED environment variable, just like we do it for the qtests.
>>>>> +# The default is to run all tests that still work fine in a CI environments,
>>>>> +# but if the user set SPEED=slow or SPEED=thorough, we also run all other
>>>>> +# tests that are still marked as "quick"
>>>>> +if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
>>>>> +    group=quick
>>>>
>>>> When user asks for "slow" tests we run the "quick" tests, which
>>>> presumably implies...
>>>>
>>>>> +else
>>>>> +    group=ci
>>>>
>>>> ..."ci" is quicker than the "quick"  tests !
>>>>
>>>> Confused ? We certainly try to ensure that you will be :-)
>>>
>>> ... and there is also tests/check-block.sh (which is not used by "make
>>> check-block", by the way, but still talks about "make check-block"),
>>> which is even slower than the "ci" and "quick" group...
>>>
>>> I guess that could be cleaned up, too (why do we need two scripts?) ...
>>> just not sure how the final result should look like and if it should be
>>> part of this patch series or rather something separate. Max, Kevin, what
>>> do you think?
>>>
>>> Maybe we should merge the two scripts, and depending on the SPEED
>>> variable, we run:
>>>
>>>    quick => "ci" group
>>>    thorough => "quick" group
>>>    slow => old behaviour of the check-block.sh script
>>
>> May be, instead of SPEED, introduce GROUP variable? To make it plain
> 
> "$SPEED" is something used/defined by the gtester harness, so other bits
> run by "make check" already honour that, hence it is desirable fro the
> iotests todo the same.
> 

OK, sorry, didn't know.


-- 
Best regards,
Vladimir

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Vladimir Sementsov-Ogievskiy]

24.04.2019 15:13, Daniel P. Berrangé wrote:
> On Wed, Apr 24, 2019 at 12:02:29PM +0000, Vladimir Sementsov-Ogievskiy wrote:
>> 24.04.2019 13:59, Thomas Huth wrote:
>>> On 24/04/2019 12.48, Daniel P. Berrangé wrote:
>>>> On Wed, Apr 24, 2019 at 12:37:46PM +0200, Thomas Huth wrote:
>>>>> People often forget to run the iotests before submitting patches or
>>>>> pull requests - this is likely due to the fact that we do not run the
>>>>> tests during our mandatory "make check" tests yet. Now that we've got
>>>>> a new "ci" group of iotests that should be fine to run in every environ-
>>>>> ment, it should be OK to enable the iotests during "make check" again.
>>>>> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
>>>>> script, and only use the former "quick" group (that contains some tests
>>>>> that are failing in some environments) when the user decided to run
>>>>> "make check SPEED=thorough" or something similar.
>>>>>
>>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>>> ---
>>>>>    tests/Makefile.include      |  2 +-
>>>>>    tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>>>>>    2 files changed, 17 insertions(+), 2 deletions(-)
>>>>
>>>>> diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
>>>>> index 0e554bb972..416b3fc48b 100755
>>>>> --- a/tests/qemu-iotests-quick.sh
>>>>> +++ b/tests/qemu-iotests-quick.sh
>>>>
>>>> s/-quick//  perhaps, since it no longer only runs the "quick" tests.
>>>>
>>>>> @@ -1,8 +1,23 @@
>>>>>    #!/bin/sh
>>>>>    
>>>>> +# Honor the SPEED environment variable, just like we do it for the qtests.
>>>>> +# The default is to run all tests that still work fine in a CI environments,
>>>>> +# but if the user set SPEED=slow or SPEED=thorough, we also run all other
>>>>> +# tests that are still marked as "quick"
>>>>> +if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
>>>>> +    group=quick
>>>>
>>>> When user asks for "slow" tests we run the "quick" tests, which
>>>> presumably implies...
>>>>
>>>>> +else
>>>>> +    group=ci
>>>>
>>>> ..."ci" is quicker than the "quick"  tests !
>>>>
>>>> Confused ? We certainly try to ensure that you will be :-)
>>>
>>> ... and there is also tests/check-block.sh (which is not used by "make
>>> check-block", by the way, but still talks about "make check-block"),
>>> which is even slower than the "ci" and "quick" group...
>>>
>>> I guess that could be cleaned up, too (why do we need two scripts?) ...
>>> just not sure how the final result should look like and if it should be
>>> part of this patch series or rather something separate. Max, Kevin, what
>>> do you think?
>>>
>>> Maybe we should merge the two scripts, and depending on the SPEED
>>> variable, we run:
>>>
>>>    quick => "ci" group
>>>    thorough => "quick" group
>>>    slow => old behaviour of the check-block.sh script
>>
>> May be, instead of SPEED, introduce GROUP variable? To make it plain
> 
> "$SPEED" is something used/defined by the gtester harness, so other bits
> run by "make check" already honour that, hence it is desirable fro the
> iotests todo the same.
> 

OK, sorry, didn't know.


-- 
Best regards,
Vladimir

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Wainer dos Santos Moschetta]

Hi Thomas,


On 04/24/2019 07:37 AM, Thomas Huth wrote:
> People often forget to run the iotests before submitting patches or
> pull requests - this is likely due to the fact that we do not run the
> tests during our mandatory "make check" tests yet. Now that we've got
> a new "ci" group of iotests that should be fine to run in every environ-
> ment, it should be OK to enable the iotests during "make check" again.
> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
> script, and only use the former "quick" group (that contains some tests
> that are failing in some environments) when the user decided to run
> "make check SPEED=thorough" or something similar.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/Makefile.include      |  2 +-
>   tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>   2 files changed, 17 insertions(+), 2 deletions(-)

One of Patchew's runners failed with this patch series:
https://patchew.org/QEMU/20190424103747.10173-1-thuth@redhat.com/

I encountered same failures with `make check` locally on Fedora 29 
x86_64 (pulled latest qemu, and configured with defaults and 
x86_64-softmmu target):
---
Not run: 233
Failures: 069 103 114 133 140 143 197 215 226 244
Failed 10 of 91 tests
---

Let me know if you need more details.

- Wainer

>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 36fc73fef5..eb6a7a41e2 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -1168,7 +1168,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
>   check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-tests/qapi-schema/doc-good.texi
>   check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
>   check-block: $(patsubst %,check-%, $(check-block-y))
> -check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
> +check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree check-block
>   check-clean:
>   	rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
>   	rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
> diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
> index 0e554bb972..416b3fc48b 100755
> --- a/tests/qemu-iotests-quick.sh
> +++ b/tests/qemu-iotests-quick.sh
> @@ -1,8 +1,23 @@
>   #!/bin/sh
>   
> +# Honor the SPEED environment variable, just like we do it for the qtests.
> +# The default is to run all tests that still work fine in a CI environments,
> +# but if the user set SPEED=slow or SPEED=thorough, we also run all other
> +# tests that are still marked as "quick"
> +if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
> +    group=quick
> +else
> +    group=ci
> +fi
> +
> +if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
> +    echo "No qemu-system binary available. Skipped qemu-iotests."
> +    exit 0
> +fi
> +
>   cd tests/qemu-iotests
>   
>   ret=0
> -TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g quick || ret=1
> +TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g "$group" || ret=1
>   
>   exit $ret

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Wainer dos Santos Moschetta]

Hi Thomas,


On 04/24/2019 07:37 AM, Thomas Huth wrote:
> People often forget to run the iotests before submitting patches or
> pull requests - this is likely due to the fact that we do not run the
> tests during our mandatory "make check" tests yet. Now that we've got
> a new "ci" group of iotests that should be fine to run in every environ-
> ment, it should be OK to enable the iotests during "make check" again.
> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
> script, and only use the former "quick" group (that contains some tests
> that are failing in some environments) when the user decided to run
> "make check SPEED=thorough" or something similar.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/Makefile.include      |  2 +-
>   tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>   2 files changed, 17 insertions(+), 2 deletions(-)

One of Patchew's runners failed with this patch series:
https://patchew.org/QEMU/20190424103747.10173-1-thuth@redhat.com/

I encountered same failures with `make check` locally on Fedora 29 
x86_64 (pulled latest qemu, and configured with defaults and 
x86_64-softmmu target):
---
Not run: 233
Failures: 069 103 114 133 140 143 197 215 226 244
Failed 10 of 91 tests
---

Let me know if you need more details.

- Wainer

>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 36fc73fef5..eb6a7a41e2 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -1168,7 +1168,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
>   check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-tests/qapi-schema/doc-good.texi
>   check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
>   check-block: $(patsubst %,check-%, $(check-block-y))
> -check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
> +check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree check-block
>   check-clean:
>   	rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
>   	rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
> diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
> index 0e554bb972..416b3fc48b 100755
> --- a/tests/qemu-iotests-quick.sh
> +++ b/tests/qemu-iotests-quick.sh
> @@ -1,8 +1,23 @@
>   #!/bin/sh
>   
> +# Honor the SPEED environment variable, just like we do it for the qtests.
> +# The default is to run all tests that still work fine in a CI environments,
> +# but if the user set SPEED=slow or SPEED=thorough, we also run all other
> +# tests that are still marked as "quick"
> +if [ "$SPEED" = "slow" -o "$SPEED" = "thorough" ]; then
> +    group=quick
> +else
> +    group=ci
> +fi
> +
> +if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
> +    echo "No qemu-system binary available. Skipped qemu-iotests."
> +    exit 0
> +fi
> +
>   cd tests/qemu-iotests
>   
>   ret=0
> -TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g quick || ret=1
> +TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g "$group" || ret=1
>   
>   exit $ret

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Thomas Huth]

On 24/04/2019 22.42, Wainer dos Santos Moschetta wrote:
> Hi Thomas,
> 
> 
> On 04/24/2019 07:37 AM, Thomas Huth wrote:
>> People often forget to run the iotests before submitting patches or
>> pull requests - this is likely due to the fact that we do not run the
>> tests during our mandatory "make check" tests yet. Now that we've got
>> a new "ci" group of iotests that should be fine to run in every environ-
>> ment, it should be OK to enable the iotests during "make check" again.
>> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
>> script, and only use the former "quick" group (that contains some tests
>> that are failing in some environments) when the user decided to run
>> "make check SPEED=thorough" or something similar.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   tests/Makefile.include      |  2 +-
>>   tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>>   2 files changed, 17 insertions(+), 2 deletions(-)
> 
> One of Patchew's runners failed with this patch series:
> https://patchew.org/QEMU/20190424103747.10173-1-thuth@redhat.com/
> 
> I encountered same failures with `make check` locally on Fedora 29
> x86_64 (pulled latest qemu, and configured with defaults and
> x86_64-softmmu target):
> ---
> Not run: 233
> Failures: 069 103 114 133 140 143 197 215 226 244

Ok, thanks for the info. Looks like many tests are failing because qemu-io suddenly prints its program name in front of the error messages? E.g.:

--- /tmp/qemu-test/src/tests/qemu-iotests/069.out	2019-04-24 16:52:31.000000000 +0000
+++ /tmp/qemu-test/build/tests/qemu-iotests/069.out.bad	2019-04-24 16:59:13.310226424 +0000
@@ -4,5 +4,5 @@
 
 Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file=TEST_DIR/t.IMGFMT.base
-can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory

Does anybody from the block folks has a clue what might be going wrong here?

 Thomas

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Thomas Huth]

On 24/04/2019 22.42, Wainer dos Santos Moschetta wrote:
> Hi Thomas,
> 
> 
> On 04/24/2019 07:37 AM, Thomas Huth wrote:
>> People often forget to run the iotests before submitting patches or
>> pull requests - this is likely due to the fact that we do not run the
>> tests during our mandatory "make check" tests yet. Now that we've got
>> a new "ci" group of iotests that should be fine to run in every environ-
>> ment, it should be OK to enable the iotests during "make check" again.
>> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
>> script, and only use the former "quick" group (that contains some tests
>> that are failing in some environments) when the user decided to run
>> "make check SPEED=thorough" or something similar.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   tests/Makefile.include      |  2 +-
>>   tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>>   2 files changed, 17 insertions(+), 2 deletions(-)
> 
> One of Patchew's runners failed with this patch series:
> https://patchew.org/QEMU/20190424103747.10173-1-thuth@redhat.com/
> 
> I encountered same failures with `make check` locally on Fedora 29
> x86_64 (pulled latest qemu, and configured with defaults and
> x86_64-softmmu target):
> ---
> Not run: 233
> Failures: 069 103 114 133 140 143 197 215 226 244

Ok, thanks for the info. Looks like many tests are failing because qemu-io suddenly prints its program name in front of the error messages? E.g.:

--- /tmp/qemu-test/src/tests/qemu-iotests/069.out	2019-04-24 16:52:31.000000000 +0000
+++ /tmp/qemu-test/build/tests/qemu-iotests/069.out.bad	2019-04-24 16:59:13.310226424 +0000
@@ -4,5 +4,5 @@
 
 Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file=TEST_DIR/t.IMGFMT.base
-can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory

Does anybody from the block folks has a clue what might be going wrong here?

 Thomas

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Thomas Huth]

On 25/04/2019 07.57, Thomas Huth wrote:
> On 24/04/2019 22.42, Wainer dos Santos Moschetta wrote:
>> Hi Thomas,
>>
>>
>> On 04/24/2019 07:37 AM, Thomas Huth wrote:
>>> People often forget to run the iotests before submitting patches or
>>> pull requests - this is likely due to the fact that we do not run the
>>> tests during our mandatory "make check" tests yet. Now that we've got
>>> a new "ci" group of iotests that should be fine to run in every environ-
>>> ment, it should be OK to enable the iotests during "make check" again.
>>> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
>>> script, and only use the former "quick" group (that contains some tests
>>> that are failing in some environments) when the user decided to run
>>> "make check SPEED=thorough" or something similar.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>   tests/Makefile.include      |  2 +-
>>>   tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>>>   2 files changed, 17 insertions(+), 2 deletions(-)
>>
>> One of Patchew's runners failed with this patch series:
>> https://patchew.org/QEMU/20190424103747.10173-1-thuth@redhat.com/
>>
>> I encountered same failures with `make check` locally on Fedora 29
>> x86_64 (pulled latest qemu, and configured with defaults and
>> x86_64-softmmu target):
>> ---
>> Not run: 233
>> Failures: 069 103 114 133 140 143 197 215 226 244
> 
> Ok, thanks for the info. Looks like many tests are failing because qemu-io suddenly prints its program name in front of the error messages? E.g.:
> 
> --- /tmp/qemu-test/src/tests/qemu-iotests/069.out	2019-04-24 16:52:31.000000000 +0000
> +++ /tmp/qemu-test/build/tests/qemu-iotests/069.out.bad	2019-04-24 16:59:13.310226424 +0000
> @@ -4,5 +4,5 @@
>  
>  Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072
>  Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file=TEST_DIR/t.IMGFMT.base
> -can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
> 
> Does anybody from the block folks has a clue what might be going wrong here?

It's a regression in the current master branch, not caused by my series.
The iotests also fail with vanilla master, e.g. reproducible with:

 cd tests/qemu-iotests
 ./check -qcow2 069

It's caused by Christophe's commit here:

 99e98d7c9fc1a1639fad2c638733b02f4b43aebe
 qemu-io: Use error_[gs]et_progname()

Christophe, could you please have a look?

 Thanks,
  Thomas

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Thomas Huth]

On 25/04/2019 07.57, Thomas Huth wrote:
> On 24/04/2019 22.42, Wainer dos Santos Moschetta wrote:
>> Hi Thomas,
>>
>>
>> On 04/24/2019 07:37 AM, Thomas Huth wrote:
>>> People often forget to run the iotests before submitting patches or
>>> pull requests - this is likely due to the fact that we do not run the
>>> tests during our mandatory "make check" tests yet. Now that we've got
>>> a new "ci" group of iotests that should be fine to run in every environ-
>>> ment, it should be OK to enable the iotests during "make check" again.
>>> Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh
>>> script, and only use the former "quick" group (that contains some tests
>>> that are failing in some environments) when the user decided to run
>>> "make check SPEED=thorough" or something similar.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>   tests/Makefile.include      |  2 +-
>>>   tests/qemu-iotests-quick.sh | 17 ++++++++++++++++-
>>>   2 files changed, 17 insertions(+), 2 deletions(-)
>>
>> One of Patchew's runners failed with this patch series:
>> https://patchew.org/QEMU/20190424103747.10173-1-thuth@redhat.com/
>>
>> I encountered same failures with `make check` locally on Fedora 29
>> x86_64 (pulled latest qemu, and configured with defaults and
>> x86_64-softmmu target):
>> ---
>> Not run: 233
>> Failures: 069 103 114 133 140 143 197 215 226 244
> 
> Ok, thanks for the info. Looks like many tests are failing because qemu-io suddenly prints its program name in front of the error messages? E.g.:
> 
> --- /tmp/qemu-test/src/tests/qemu-iotests/069.out	2019-04-24 16:52:31.000000000 +0000
> +++ /tmp/qemu-test/build/tests/qemu-iotests/069.out.bad	2019-04-24 16:59:13.310226424 +0000
> @@ -4,5 +4,5 @@
>  
>  Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072
>  Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file=TEST_DIR/t.IMGFMT.base
> -can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
> 
> Does anybody from the block folks has a clue what might be going wrong here?

It's a regression in the current master branch, not caused by my series.
The iotests also fail with vanilla master, e.g. reproducible with:

 cd tests/qemu-iotests
 ./check -qcow2 069

It's caused by Christophe's commit here:

 99e98d7c9fc1a1639fad2c638733b02f4b43aebe
 qemu-io: Use error_[gs]et_progname()

Christophe, could you please have a look?

 Thanks,
  Thomas

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]

On 4/25/19 5:24 AM, Thomas Huth wrote:

>> Ok, thanks for the info. Looks like many tests are failing because qemu-io suddenly prints its program name in front of the error messages? E.g.:
>>
>> --- /tmp/qemu-test/src/tests/qemu-iotests/069.out	2019-04-24 16:52:31.000000000 +0000
>> +++ /tmp/qemu-test/build/tests/qemu-iotests/069.out.bad	2019-04-24 16:59:13.310226424 +0000
>> @@ -4,5 +4,5 @@
>>  
>>  Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072
>>  Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file=TEST_DIR/t.IMGFMT.base
>> -can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
>> +qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
>>
>> Does anybody from the block folks has a clue what might be going wrong here?
> 
> It's a regression in the current master branch, not caused by my series.
> The iotests also fail with vanilla master, e.g. reproducible with:
> 
>  cd tests/qemu-iotests
>  ./check -qcow2 069
> 
> It's caused by Christophe's commit here:
> 
>  99e98d7c9fc1a1639fad2c638733b02f4b43aebe
>  qemu-io: Use error_[gs]et_progname()
> 
> Christophe, could you please have a look?

The change in output is desirable, but yes, it does mean that iotests
need to have .out files updated to match.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]

On 4/25/19 5:24 AM, Thomas Huth wrote:

>> Ok, thanks for the info. Looks like many tests are failing because qemu-io suddenly prints its program name in front of the error messages? E.g.:
>>
>> --- /tmp/qemu-test/src/tests/qemu-iotests/069.out	2019-04-24 16:52:31.000000000 +0000
>> +++ /tmp/qemu-test/build/tests/qemu-iotests/069.out.bad	2019-04-24 16:59:13.310226424 +0000
>> @@ -4,5 +4,5 @@
>>  
>>  Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072
>>  Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file=TEST_DIR/t.IMGFMT.base
>> -can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
>> +qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
>>
>> Does anybody from the block folks has a clue what might be going wrong here?
> 
> It's a regression in the current master branch, not caused by my series.
> The iotests also fail with vanilla master, e.g. reproducible with:
> 
>  cd tests/qemu-iotests
>  ./check -qcow2 069
> 
> It's caused by Christophe's commit here:
> 
>  99e98d7c9fc1a1639fad2c638733b02f4b43aebe
>  qemu-io: Use error_[gs]et_progname()
> 
> Christophe, could you please have a look?

The change in output is desirable, but yes, it does mean that iotests
need to have .out files updated to match.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[Qemu-devel] [PATCH 6/6] tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests

[Thomas Huth]

A lot of tests run fine on FreeBSD and macOS, too - the limitation
to Linux here was likely just copied-and-pasted from other tests.
Thus remove the "_supported_os Linux" line from tests that run
successful in our CI pipelines on FreeBSD and macOS.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/001 | 1 -
 tests/qemu-iotests/002 | 1 -
 tests/qemu-iotests/003 | 1 -
 tests/qemu-iotests/004 | 1 -
 tests/qemu-iotests/005 | 1 -
 tests/qemu-iotests/007 | 1 -
 tests/qemu-iotests/008 | 1 -
 tests/qemu-iotests/009 | 1 -
 tests/qemu-iotests/010 | 1 -
 tests/qemu-iotests/011 | 1 -
 tests/qemu-iotests/012 | 1 -
 tests/qemu-iotests/013 | 1 -
 tests/qemu-iotests/014 | 1 -
 tests/qemu-iotests/015 | 1 -
 tests/qemu-iotests/017 | 1 -
 tests/qemu-iotests/020 | 1 -
 tests/qemu-iotests/021 | 1 -
 tests/qemu-iotests/022 | 1 -
 tests/qemu-iotests/023 | 1 -
 tests/qemu-iotests/025 | 1 -
 tests/qemu-iotests/026 | 1 -
 tests/qemu-iotests/027 | 1 -
 tests/qemu-iotests/028 | 1 -
 tests/qemu-iotests/029 | 1 -
 tests/qemu-iotests/031 | 1 -
 tests/qemu-iotests/032 | 1 -
 tests/qemu-iotests/033 | 1 -
 tests/qemu-iotests/035 | 1 -
 tests/qemu-iotests/036 | 1 -
 tests/qemu-iotests/037 | 1 -
 tests/qemu-iotests/042 | 1 -
 tests/qemu-iotests/043 | 1 -
 tests/qemu-iotests/046 | 1 -
 tests/qemu-iotests/047 | 1 -
 tests/qemu-iotests/049 | 1 -
 tests/qemu-iotests/050 | 1 -
 tests/qemu-iotests/051 | 1 -
 tests/qemu-iotests/052 | 1 -
 tests/qemu-iotests/053 | 1 -
 tests/qemu-iotests/054 | 1 -
 tests/qemu-iotests/060 | 1 -
 tests/qemu-iotests/061 | 1 -
 tests/qemu-iotests/062 | 1 -
 tests/qemu-iotests/063 | 1 -
 tests/qemu-iotests/066 | 1 -
 tests/qemu-iotests/067 | 1 -
 tests/qemu-iotests/068 | 1 -
 tests/qemu-iotests/069 | 1 -
 tests/qemu-iotests/071 | 1 -
 tests/qemu-iotests/072 | 1 -
 tests/qemu-iotests/073 | 1 -
 tests/qemu-iotests/079 | 1 -
 tests/qemu-iotests/080 | 1 -
 tests/qemu-iotests/082 | 1 -
 tests/qemu-iotests/085 | 1 -
 tests/qemu-iotests/089 | 1 -
 tests/qemu-iotests/090 | 1 -
 tests/qemu-iotests/091 | 1 -
 tests/qemu-iotests/094 | 1 -
 tests/qemu-iotests/095 | 1 -
 tests/qemu-iotests/097 | 1 -
 tests/qemu-iotests/098 | 1 -
 tests/qemu-iotests/102 | 1 -
 tests/qemu-iotests/103 | 1 -
 tests/qemu-iotests/104 | 1 -
 tests/qemu-iotests/105 | 1 -
 tests/qemu-iotests/107 | 1 -
 tests/qemu-iotests/110 | 1 -
 tests/qemu-iotests/111 | 1 -
 tests/qemu-iotests/112 | 1 -
 tests/qemu-iotests/114 | 1 -
 tests/qemu-iotests/115 | 1 -
 tests/qemu-iotests/117 | 1 -
 tests/qemu-iotests/120 | 1 -
 tests/qemu-iotests/121 | 1 -
 tests/qemu-iotests/122 | 1 -
 tests/qemu-iotests/125 | 1 -
 tests/qemu-iotests/126 | 1 -
 tests/qemu-iotests/127 | 1 -
 tests/qemu-iotests/130 | 1 -
 tests/qemu-iotests/133 | 1 -
 tests/qemu-iotests/134 | 1 -
 tests/qemu-iotests/137 | 1 -
 tests/qemu-iotests/138 | 1 -
 tests/qemu-iotests/141 | 1 -
 tests/qemu-iotests/142 | 1 -
 tests/qemu-iotests/143 | 1 -
 tests/qemu-iotests/144 | 1 -
 tests/qemu-iotests/145 | 1 -
 tests/qemu-iotests/153 | 1 -
 tests/qemu-iotests/156 | 1 -
 tests/qemu-iotests/157 | 1 -
 tests/qemu-iotests/158 | 1 -
 tests/qemu-iotests/159 | 1 -
 tests/qemu-iotests/161 | 1 -
 tests/qemu-iotests/162 | 1 -
 tests/qemu-iotests/170 | 1 -
 tests/qemu-iotests/172 | 1 -
 tests/qemu-iotests/173 | 1 -
 tests/qemu-iotests/176 | 1 -
 tests/qemu-iotests/178 | 1 -
 tests/qemu-iotests/181 | 1 -
 tests/qemu-iotests/182 | 1 -
 tests/qemu-iotests/183 | 1 -
 tests/qemu-iotests/185 | 1 -
 tests/qemu-iotests/186 | 1 -
 tests/qemu-iotests/187 | 1 -
 tests/qemu-iotests/189 | 1 -
 tests/qemu-iotests/190 | 1 -
 tests/qemu-iotests/191 | 1 -
 tests/qemu-iotests/192 | 1 -
 tests/qemu-iotests/195 | 1 -
 tests/qemu-iotests/197 | 1 -
 tests/qemu-iotests/198 | 1 -
 tests/qemu-iotests/200 | 1 -
 tests/qemu-iotests/201 | 1 -
 tests/qemu-iotests/214 | 1 -
 tests/qemu-iotests/215 | 1 -
 tests/qemu-iotests/217 | 1 -
 tests/qemu-iotests/220 | 1 -
 tests/qemu-iotests/227 | 1 -
 tests/qemu-iotests/229 | 1 -
 tests/qemu-iotests/231 | 1 -
 tests/qemu-iotests/232 | 1 -
 tests/qemu-iotests/233 | 1 -
 tests/qemu-iotests/240 | 1 -
 tests/qemu-iotests/247 | 1 -
 127 files changed, 127 deletions(-)

diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001
index 5d266e170a..d87a535c33 100755
--- a/tests/qemu-iotests/001
+++ b/tests/qemu-iotests/001
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002
index 7fb85084a1..fd413bce48 100755
--- a/tests/qemu-iotests/002
+++ b/tests/qemu-iotests/002
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003
index f008c57cdc..ccd3a39dfb 100755
--- a/tests/qemu-iotests/003
+++ b/tests/qemu-iotests/003
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 size=128M
 offset=67M
diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004
index 64fab3e714..d308dc4b49 100755
--- a/tests/qemu-iotests/004
+++ b/tests/qemu-iotests/004
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt raw qcow qcow2 qed vdi vmdk vhdx luks
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
index 2fef63af88..f909eb1cc1 100755
--- a/tests/qemu-iotests/005
+++ b/tests/qemu-iotests/005
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
                      "subformat=twoGbMaxExtentSparse"
 
diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
index 3ab5490db3..6abd402423 100755
--- a/tests/qemu-iotests/007
+++ b/tests/qemu-iotests/007
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # currently only qcow2 allows for consistency checks using qemu-img
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 # refcount_bits must be at least 4 so we can create ten internal snapshots
 # (1 bit supports none, 2 bits support two, 4 bits support 14)
 _unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]'
diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008
index 75067e36ad..2b81b119bf 100755
--- a/tests/qemu-iotests/008
+++ b/tests/qemu-iotests/008
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
index bc4b461122..51b200db1d 100755
--- a/tests/qemu-iotests/009
+++ b/tests/qemu-iotests/009
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=6G
diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
index 6920408d28..48c533f632 100755
--- a/tests/qemu-iotests/010
+++ b/tests/qemu-iotests/010
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=6G
diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
index b4c7e8f799..8b1fce069a 100755
--- a/tests/qemu-iotests/011
+++ b/tests/qemu-iotests/011
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=6G
diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012
index 2c3b42d9dd..12957285b3 100755
--- a/tests/qemu-iotests/012
+++ b/tests/qemu-iotests/012
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 
 # Remove once all tests are fixed to use TEST_IMG_FILE
 # correctly and common.rc sets it unconditionally
diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013
index 5cb9032f16..8e9892e9ee 100755
--- a/tests/qemu-iotests/013
+++ b/tests/qemu-iotests/013
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # much of this could be generic for any format supporting compression.
 _supported_fmt qcow qcow2
 _supported_proto file
-_supported_os Linux
 
 TEST_OFFSETS="0 4294967296"
 TEST_OPS="writev read write readv"
diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014
index 2f728a1956..9395bec60b 100755
--- a/tests/qemu-iotests/014
+++ b/tests/qemu-iotests/014
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # much of this could be generic for any format supporting snapshots
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 TEST_OFFSETS="0 4294967296"
 TEST_OPS="writev read write readv"
diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
index 5a4063e4f5..eec5387f3d 100755
--- a/tests/qemu-iotests/015
+++ b/tests/qemu-iotests/015
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # actually any format that supports snapshots
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 # Internal snapshots are (currently) impossible with refcount_bits=1
 _unsupported_imgopts 'refcount_bits=1[^0-9]'
 
diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index 83744f29a3..79875de454 100755
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 TEST_OFFSETS="0 4294967296"
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index 71fa753b4e..6b0ebb37d2 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto file
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
                      "subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021
index f6555f3b74..f888269fd4 100755
--- a/tests/qemu-iotests/021
+++ b/tests/qemu-iotests/021
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022
index b68cd64b33..99eb08f57f 100755
--- a/tests/qemu-iotests/022
+++ b/tests/qemu-iotests/022
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format that supports snapshots
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 TEST_OFFSETS="10485760 4294967296"
 CLUSTER_SIZE="4096"
diff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023
index 02ed047820..f96d8c08b7 100755
--- a/tests/qemu-iotests/023
+++ b/tests/qemu-iotests/023
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # much of this could be generic for any format supporting compression.
 _supported_fmt qcow qcow2
 _supported_proto file
-_supported_os Linux
 
 TEST_OFFSETS="0 4294967296"
 TEST_OPS="writev read write readv"
diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025
index d9a4ebc5e7..e05d833452 100755
--- a/tests/qemu-iotests/025
+++ b/tests/qemu-iotests/025
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt raw qcow2 qed luks
 _supported_proto file sheepdog rbd nfs
-_supported_os Linux
 
 echo "=== Creating image"
 echo
diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
index ca89ad7048..e30243608b 100755
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Currently only qcow2 supports rebasing
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 _default_cache_mode "writethrough"
 _supported_cache_modes "writethrough" "none"
 # The refcount table tests expect a certain minimum width for refcount entries
diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027
index b7df9701f7..4cb638022a 100755
--- a/tests/qemu-iotests/027
+++ b/tests/qemu-iotests/027
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt vmdk qcow qcow2 qed
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
index 01f495912f..08bc5cc8ec 100755
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028
@@ -47,7 +47,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # smaller backing files.
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 # Choose a size that is not necessarily a cluster size multiple for image
 # formats that use clusters.  This will ensure that the base image doesn't end
diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
index 5f42f76cc6..94c2713132 100755
--- a/tests/qemu-iotests/029
+++ b/tests/qemu-iotests/029
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 # Internal snapshots are (currently) impossible with refcount_bits=1
 _unsupported_imgopts 'refcount_bits=1[^0-9]'
 
diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
index ef92d8eee3..a3c25ec237 100755
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 CLUSTER_SIZE=65536
 
diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032
index a1757bb15e..23c216c549 100755
--- a/tests/qemu-iotests/032
+++ b/tests/qemu-iotests/032
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This works for any image format (though unlikely to segfault for raw)
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 echo
 echo === Prepare image ===
diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033
index cfdf1ec2ba..362a48c0a0 100755
--- a/tests/qemu-iotests/033
+++ b/tests/qemu-iotests/033
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035
index 46aa835936..ad6fa3115a 100755
--- a/tests/qemu-iotests/035
+++ b/tests/qemu-iotests/035
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 
 size=6G
diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index 1b56394129..f06ff67408 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 # Only qcow2v3 and later supports feature bits
 IMGOPTS="compat=1.1"
diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037
index 0781bebefe..819a2a52d2 100755
--- a/tests/qemu-iotests/037
+++ b/tests/qemu-iotests/037
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto file
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
                      "subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042
index a9a7fc3041..0e85b356b7 100755
--- a/tests/qemu-iotests/042
+++ b/tests/qemu-iotests/042
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 echo
 echo "== Creating zero size image =="
diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
index 9894b154ec..67cc7e74c2 100755
--- a/tests/qemu-iotests/043
+++ b/tests/qemu-iotests/043
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
index 95160bea4c..543355c64f 100755
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 CLUSTER_SIZE=64k
 size=128M
diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047
index ce81fc6fa7..4528465fb0 100755
--- a/tests/qemu-iotests/047
+++ b/tests/qemu-iotests/047
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 size=128M
 
diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049
index bc09cd6717..c100d30ed0 100755
--- a/tests/qemu-iotests/049
+++ b/tests/qemu-iotests/049
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 filter_test_dir()
 {
diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
index dd7b2c72eb..211fc00797 100755
--- a/tests/qemu-iotests/050
+++ b/tests/qemu-iotests/050
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then
   IMGOPTS=compat=1.1
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index 02ac960da4..a3deb1fcad 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # A compat=0.10 image is created in this test which does not support anything
 # other than refcount_bits=16
 _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052
index b3a2dc1143..6e2ecbfe21 100755
--- a/tests/qemu-iotests/052
+++ b/tests/qemu-iotests/052
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 
 # Don't do O_DIRECT on tmpfs
 _supported_cache_modes "writeback" "writethrough" "unsafe"
diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
index 50c62f0f56..e82bb69881 100755
--- a/tests/qemu-iotests/053
+++ b/tests/qemu-iotests/053
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 qcow
 _supported_proto file
-_supported_os Linux
 
 echo
 echo "== Creating single sector image =="
diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054
index 0d5e14f847..a8905b60d0 100755
--- a/tests/qemu-iotests/054
+++ b/tests/qemu-iotests/054
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 echo
 echo "creating too large image (1 EB)"
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index 89e911400c..b65a505199 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -47,7 +47,6 @@ _filter_io_error()
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 rt_offset=65536  # 0x10000 (XXX: just an assumption)
 rb_offset=131072 # 0x20000 (XXX: just an assumption)
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index d7dbd7e2c7..b7e2e27b96 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 echo
 echo "=== Testing version downgrade with zero expansion ==="
diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
index ed7400fed2..d5f818fcce 100755
--- a/tests/qemu-iotests/062
+++ b/tests/qemu-iotests/062
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 IMGOPTS="compat=1.1"
 IMG_SIZE=64M
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index 2d5c0ce9fb..fe4892e467 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow qcow2 vmdk qed raw
 _supported_proto file
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
                      "subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
index f480986e35..28f8c98412 100755
--- a/tests/qemu-iotests/066
+++ b/tests/qemu-iotests/066
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 # Intentionally create an unaligned image
 IMGOPTS="compat=1.1"
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index fda16a6b0d..926c79b37c 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -32,7 +32,6 @@ status=1	# failure is the default!
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # Because anything other than 16 would change the output of query-block
 _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
 
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index 881a022107..22f5ca3ba6 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 IMGOPTS="compat=1.1"
 IMG_SIZE=128K
diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
index 6a8e4aa22e..3974714852 100755
--- a/tests/qemu-iotests/069
+++ b/tests/qemu-iotests/069
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qed qcow qcow2 vmdk
 _supported_proto file
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 IMG_SIZE=128K
diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index 7f3e5abd57..1cca9233d0 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072
index 6f9f247fa5..661b36da2d 100755
--- a/tests/qemu-iotests/072
+++ b/tests/qemu-iotests/072
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow
 _supported_proto file
-_supported_os Linux
 
 IMG_SIZE=64M
 
diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
index 990f90acbd..e684b1b780 100755
--- a/tests/qemu-iotests/073
+++ b/tests/qemu-iotests/073
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 
 CLUSTER_SIZE=64k
 size=128M
diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
index 1b6594ebef..81f0c21f53 100755
--- a/tests/qemu-iotests/079
+++ b/tests/qemu-iotests/079
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
-_supported_os Linux
 
 echo "=== Check option preallocation and cluster_size ==="
 echo
diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
index 4bcb5021e8..46d7898e84 100755
--- a/tests/qemu-iotests/080
+++ b/tests/qemu-iotests/080
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # - Internal snapshots are (currently) impossible with refcount_bits=1
 # - This is generally a test for compat=1.1 images
 _unsupported_imgopts 'refcount_bits=1[^0-9]' 'compat=0.10'
diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
index d0afa46e9a..d084a0844d 100755
--- a/tests/qemu-iotests/082
+++ b/tests/qemu-iotests/082
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
-_supported_os Linux
 
 run_qemu_img()
 {
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
index 68cb665987..d40fdab542 100755
--- a/tests/qemu-iotests/085
+++ b/tests/qemu-iotests/085
@@ -56,7 +56,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 
 # ${1}: unique identifier for the snapshot filename
diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089
index 6609954908..ad029f1f09 100755
--- a/tests/qemu-iotests/089
+++ b/tests/qemu-iotests/089
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # Because anything other than 16 would change the output of qemu_io -c info
 _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
 
diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090
index 193bae7d77..9f8cfbb80f 100755
--- a/tests/qemu-iotests/090
+++ b/tests/qemu-iotests/090
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
-_supported_os Linux
 
 IMG_SIZE=128K
 
diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
index d62ef18a02..390e623c0c 100755
--- a/tests/qemu-iotests/091
+++ b/tests/qemu-iotests/091
@@ -45,7 +45,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 _default_cache_mode "none"
 _supported_cache_modes "writethrough" "none" "writeback"
 
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index 0bcca77261..9343e09492 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto nbd
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 _make_test_img 64M
diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
index 18505b7181..58fe174b5e 100755
--- a/tests/qemu-iotests/095
+++ b/tests/qemu-iotests/095
@@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 size_smaller=5M
 size_larger=100M
diff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097
index 690f3d3ce1..23988f5181 100755
--- a/tests/qemu-iotests/097
+++ b/tests/qemu-iotests/097
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files and bdrv_make_empty
 _supported_fmt qcow qcow2
 _supported_proto file
-_supported_os Linux
 
 
 # Four main passes:
diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
index 461144c831..1c1d1c468f 100755
--- a/tests/qemu-iotests/098
+++ b/tests/qemu-iotests/098
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 IMGOPTS="compat=1.1"
 
diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
index cedd2b25dc..749ff66b8a 100755
--- a/tests/qemu-iotests/102
+++ b/tests/qemu-iotests/102
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 IMG_SIZE=64K
 
diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
index 6773e94d9f..554b9de054 100755
--- a/tests/qemu-iotests/103
+++ b/tests/qemu-iotests/103
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
-_supported_os Linux
 # Internal snapshots are (currently) impossible with refcount_bits=1
 _unsupported_imgopts 'refcount_bits=1[^0-9]'
 
diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104
index 390167bad4..c70f28a9a1 100755
--- a/tests/qemu-iotests/104
+++ b/tests/qemu-iotests/104
@@ -34,7 +34,6 @@ trap "exit \$status" 0 1 2 3 15
 
 _supported_fmt raw qcow qcow2 qed vdi vmdk vhdx
 _supported_proto generic
-_supported_os Linux
 
 echo "=== Check qemu-img info output ==="
 echo
diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105
index 3b5a596844..3346e8cb25 100755
--- a/tests/qemu-iotests/105
+++ b/tests/qemu-iotests/105
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 vmdk vhdx qed
 _supported_proto generic
-_supported_os Linux
 _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
                      "subformat=twoGbMaxExtentSparse"
 
diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107
index fcd5a24dfe..268ba27688 100755
--- a/tests/qemu-iotests/107
+++ b/tests/qemu-iotests/107
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
-_supported_os Linux
 
 
 IMG_SIZE=64K
diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index fad672c1ae..4318341ac5 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files
 _supported_fmt qed qcow qcow2 vmdk
 _supported_proto file
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 TEST_IMG_REL=$(basename "$TEST_IMG")
diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
index 57395be64c..490a5bbcb5 100755
--- a/tests/qemu-iotests/111
+++ b/tests/qemu-iotests/111
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qed qcow qcow2 vmdk
 _supported_proto file
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 $QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
index 6d81c75a9c..706c10b600 100755
--- a/tests/qemu-iotests/112
+++ b/tests/qemu-iotests/112
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # This test will set refcount_bits on its own which would conflict with the
 # manual setting; compat will be overridden as well
 _unsupported_imgopts refcount_bits 'compat=0.10'
diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
index f36b88f3f3..f90a744fc0 100755
--- a/tests/qemu-iotests/114
+++ b/tests/qemu-iotests/114
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 
 
 TEST_IMG="$TEST_IMG.base" _make_test_img 64M
diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
index 7ed347010f..9ed3cb6a83 100755
--- a/tests/qemu-iotests/115
+++ b/tests/qemu-iotests/115
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # This test relies on refcounts being 64 bits wide (which does not work with
 # compat=0.10)
 _unsupported_imgopts 'refcount_bits=\([^6]\|.\([^4]\|$\)\)' 'compat=0.10'
diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
index 0af0f31c5a..f37b34f8b1 100755
--- a/tests/qemu-iotests/117
+++ b/tests/qemu-iotests/117
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 _make_test_img 64k
 
diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120
index ca95b9276e..e9b4fbb009 100755
--- a/tests/qemu-iotests/120
+++ b/tests/qemu-iotests/120
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 _unsupported_fmt luks
 
 _make_test_img 64M
diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
index 90a0424edb..cf67728d72 100755
--- a/tests/qemu-iotests/121
+++ b/tests/qemu-iotests/121
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 echo
 echo '=== New refcount structures may not conflict with existing structures ==='
diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122
index 85c3a8d047..88bb6cec72 100755
--- a/tests/qemu-iotests/122
+++ b/tests/qemu-iotests/122
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 
 TEST_IMG="$TEST_IMG".base _make_test_img 64M
diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
index 212dcd8f0d..dc4b8f5fb9 100755
--- a/tests/qemu-iotests/125
+++ b/tests/qemu-iotests/125
@@ -44,7 +44,6 @@ get_image_size_on_host()
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 if [ -z "$TEST_IMG_FILE" ]; then
     TEST_IMG_FILE=$TEST_IMG
diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126
index 96dc048d59..580fae5d62 100755
--- a/tests/qemu-iotests/126
+++ b/tests/qemu-iotests/126
@@ -37,7 +37,6 @@ _supported_fmt qcow qcow2 qed vmdk
 # colons which separate a protocol prefix from the rest and colons which are
 # just part of the filename, so we cannot test protocols which require a prefix)
 _supported_proto file
-_supported_os Linux
 
 echo
 echo '=== Testing plain files ==='
diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127
index 3e941f74d4..b64926ab31 100755
--- a/tests/qemu-iotests/127
+++ b/tests/qemu-iotests/127
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 IMG_SIZE=64K
 
diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
index 77ad2aa13a..c64ef5e906 100755
--- a/tests/qemu-iotests/130
+++ b/tests/qemu-iotests/130
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 # We are going to use lazy-refcounts
 _unsupported_imgopts 'compat=0.10'
 
diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133
index 1f6056d144..6f7cacc091 100755
--- a/tests/qemu-iotests/133
+++ b/tests/qemu-iotests/133
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 TEST_IMG="$TEST_IMG.base" _make_test_img 64M
 _make_test_img -b "$TEST_IMG.base"
diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134
index e9e3e84c2a..141a2eaa7e 100755
--- a/tests/qemu-iotests/134
+++ b/tests/qemu-iotests/134
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
index 0c3d2a1cf0..915eb2d62b 100755
--- a/tests/qemu-iotests/137
+++ b/tests/qemu-iotests/137
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # We are going to use lazy-refcounts
 _unsupported_imgopts 'compat=0.10'
 
diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
index f353ac8219..736153a484 100755
--- a/tests/qemu-iotests/138
+++ b/tests/qemu-iotests/138
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 echo
 echo '=== Check on an image with a multiple of 2^32 clusters ==='
diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
index 2197a82d45..34ed9676b0 100755
--- a/tests/qemu-iotests/141
+++ b/tests/qemu-iotests/141
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Needs backing file and backing format support
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 
 test_blockjob()
diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142
index d9b98cf60a..6b62271876 100755
--- a/tests/qemu-iotests/142
+++ b/tests/qemu-iotests/142
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 # We test all cache modes anyway, but O_DIRECT needs to be supported
 _default_cache_mode none
diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
index c223867cb3..92249ac8da 100755
--- a/tests/qemu-iotests/143
+++ b/tests/qemu-iotests/143
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 keep_stderr=y \
 _launch_qemu 2> >(_filter_nbd)
diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
index 15157f33d7..011ed4f2bc 100755
--- a/tests/qemu-iotests/144
+++ b/tests/qemu-iotests/144
@@ -46,7 +46,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 size=512M
 
diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145
index 28878dc8a1..9427549651 100755
--- a/tests/qemu-iotests/145
+++ b/tests/qemu-iotests/145
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 _make_test_img 1M
 
diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
index 08ad8a6730..c969a1a16f 100755
--- a/tests/qemu-iotests/153
+++ b/tests/qemu-iotests/153
@@ -62,7 +62,6 @@ _check_ofd || _notrun "OFD lock not available"
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 _run_cmd()
 {
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index 8d134029c6..2ffa3ca942 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -49,7 +49,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2 qed
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 
 # Create source disk
 TEST_IMG="$TEST_IMG.backing" _make_test_img 1M
diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157
index 69b25cab30..7cbac38099 100755
--- a/tests/qemu-iotests/157
+++ b/tests/qemu-iotests/157
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158
index 8c0928a7f9..ba4db6116a 100755
--- a/tests/qemu-iotests/158
+++ b/tests/qemu-iotests/158
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159
index 29066eebde..2557140ac2 100755
--- a/tests/qemu-iotests/159
+++ b/tests/qemu-iotests/159
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 _unsupported_fmt luks
 
 TEST_SIZES="5 512 1024 1999 1K 64K 1M"
diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161
index 456a4bd8c4..d46e3ba485 100755
--- a/tests/qemu-iotests/161
+++ b/tests/qemu-iotests/161
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format implementing BlockDriver.bdrv_change_backing_file
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 IMG_SIZE=1M
 
diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
index 2e9947fd9a..4e5ed74fd5 100755
--- a/tests/qemu-iotests/162
+++ b/tests/qemu-iotests/162
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt generic
-_supported_os Linux
 
 test_ssh=$($QEMU_IMG --help | grep '^Supported formats:.* ssh\( \|$\)')
 [ "$test_ssh" = "" ] && _notrun "ssh support required"
diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170
index 7deb7563c9..05dd6ed6c3 100755
--- a/tests/qemu-iotests/170
+++ b/tests/qemu-iotests/170
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 _unsupported_fmt luks
 
 echo
diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172
index ba7dad9057..2e78900c98 100755
--- a/tests/qemu-iotests/172
+++ b/tests/qemu-iotests/172
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
     _notrun "Requires a PC machine"
diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
index 47036a5564..9e2fa2e73c 100755
--- a/tests/qemu-iotests/173
+++ b/tests/qemu-iotests/173
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto nfs
-_supported_os Linux
 
 size=100M
 
diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176
index 50df4c00fa..a8bdbf1628 100755
--- a/tests/qemu-iotests/176
+++ b/tests/qemu-iotests/176
@@ -46,7 +46,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This test is specific to qcow2
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # Persistent dirty bitmaps require compat=1.1
 _unsupported_imgopts 'compat=0.10'
 
diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
index 21231cadd3..dc371a0ae6 100755
--- a/tests/qemu-iotests/178
+++ b/tests/qemu-iotests/178
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt raw qcow2
 _supported_proto file
-_supported_os Linux
 
 echo "== Input validation =="
 echo
diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181
index e317e63422..c62c6c36ae 100755
--- a/tests/qemu-iotests/181
+++ b/tests/qemu-iotests/181
@@ -45,7 +45,6 @@ _supported_fmt generic
 # Formats that do not support live migration
 _unsupported_fmt qcow vdi vhdx vmdk vpc vvfat parallels
 _supported_proto generic
-_supported_os Linux
 
 size=64M
 _make_test_img $size
diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
index ff3d7e7ec1..fd7627fb65 100755
--- a/tests/qemu-iotests/182
+++ b/tests/qemu-iotests/182
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 size=32M
 
diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
index 93b7bd798a..fbe5a99beb 100755
--- a/tests/qemu-iotests/183
+++ b/tests/qemu-iotests/183
@@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 raw qed quorum
 _supported_proto file
-_supported_os Linux
 
 size=64M
 _make_test_img $size
diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185
index 454ff600cc..6358ebeea5 100755
--- a/tests/qemu-iotests/185
+++ b/tests/qemu-iotests/185
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 size=64M
 TEST_IMG="${TEST_IMG}.base" _make_test_img $size
diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186
index 5dd2177b89..7e7d45babc 100755
--- a/tests/qemu-iotests/186
+++ b/tests/qemu-iotests/186
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
     _notrun "Requires a PC machine"
diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
index a45addde09..2fcef9e2bd 100755
--- a/tests/qemu-iotests/187
+++ b/tests/qemu-iotests/187
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 size=64M
 _make_test_img $size
diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189
index c9ce9d3bed..e9daa4df73 100755
--- a/tests/qemu-iotests/189
+++ b/tests/qemu-iotests/189
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 
 size=16M
diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
index e1c1d407f0..eb766ad09f 100755
--- a/tests/qemu-iotests/190
+++ b/tests/qemu-iotests/190
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # See 178 for more extensive tests across more formats
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 echo "== Huge file =="
 echo
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index 1ea908ce3d..528022e8d8 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 size=64M
 
diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
index 158086f9d2..84d1ed7cfa 100755
--- a/tests/qemu-iotests/192
+++ b/tests/qemu-iotests/192
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 
 if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
     _notrun "Requires a PC machine"
diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
index bd1b71ae5e..ef7b9a94e2 100755
--- a/tests/qemu-iotests/195
+++ b/tests/qemu-iotests/195
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index 2c664793f4..383d7d7f61 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -51,7 +51,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Test is supported for any backing file; but we force qcow2 for our wrapper.
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 # LUKS support may be possible, but it complicates things.
 _unsupported_fmt luks
 
diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
index c8f824cfae..c7aca42abc 100755
--- a/tests/qemu-iotests/198
+++ b/tests/qemu-iotests/198
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 
 size=16M
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index 1c0f8cafc2..72d431f251 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 BACKING_IMG="${TEST_DIR}/backing.img"
 TEST_IMG="${TEST_DIR}/test.img"
diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201
index 7abf740fe4..6705532758 100755
--- a/tests/qemu-iotests/201
+++ b/tests/qemu-iotests/201
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 # Internal snapshots are (currently) impossible with refcount_bits=1
 # This was taken from test 080
diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
index c1a452ff9a..21ec8a2ad8 100755
--- a/tests/qemu-iotests/214
+++ b/tests/qemu-iotests/214
@@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 # Repairing the corrupted image requires qemu-img check to store a
 # refcount up to 3, which requires at least two refcount bits.
diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index 7b063d7cfa..958c14f5a0 100755
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215
@@ -48,7 +48,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Test is supported for any backing file; but we force qcow2 for our wrapper.
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 # LUKS support may be possible, but it complicates things.
 _unsupported_fmt luks
 
diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217
index f5482bb669..58a78a6098 100755
--- a/tests/qemu-iotests/217
+++ b/tests/qemu-iotests/217
@@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This test is specific to qcow2
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 # This test needs clusters with at least a refcount of 2 so that
 # OFLAG_COPIED is not set.  refcount_bits=1 is therefore unsupported.
diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
index 2d62c5dcac..14f8f197a0 100755
--- a/tests/qemu-iotests/220
+++ b/tests/qemu-iotests/220
@@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 echo "== Creating huge file =="
 
diff --git a/tests/qemu-iotests/227 b/tests/qemu-iotests/227
index 10cf144eb0..bdd727a721 100755
--- a/tests/qemu-iotests/227
+++ b/tests/qemu-iotests/227
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
index e18a464fe0..750b22f582 100755
--- a/tests/qemu-iotests/229
+++ b/tests/qemu-iotests/229
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Needs backing file and backing format support
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 
 DEST_IMG="$TEST_DIR/d.$IMGFMT"
diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231
index 5b2cbab9ac..c0b053ac30 100755
--- a/tests/qemu-iotests/231
+++ b/tests/qemu-iotests/231
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto rbd
-_supported_os Linux
 
 BOGUS_CONF=${TEST_DIR}/ceph-$$.conf
 touch "${BOGUS_CONF}"
diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
index 2063f78876..374d38dce2 100755
--- a/tests/qemu-iotests/232
+++ b/tests/qemu-iotests/232
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233
index b8b6c8cc4c..5855f94b9a 100755
--- a/tests/qemu-iotests/233
+++ b/tests/qemu-iotests/233
@@ -47,7 +47,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt raw qcow2
 _supported_proto file
 # If porting to non-Linux, consider using socat instead of ss in common.nbd
-_supported_os Linux
 _require_command QEMU_NBD
 
 nbd_server_set_tcp_port
diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
index d3e663ed65..b4cf95096d 100755
--- a/tests/qemu-iotests/240
+++ b/tests/qemu-iotests/240
@@ -33,7 +33,6 @@ status=1	# failure is the default!
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
index fc50eb5dc1..546a794d3d 100755
--- a/tests/qemu-iotests/247
+++ b/tests/qemu-iotests/247
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Requires backing files and .bdrv_change_backing_file support
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 size=128M
 
-- 
2.21.0

[Qemu-devel] [PATCH 6/6] tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests

[Thomas Huth]

A lot of tests run fine on FreeBSD and macOS, too - the limitation
to Linux here was likely just copied-and-pasted from other tests.
Thus remove the "_supported_os Linux" line from tests that run
successful in our CI pipelines on FreeBSD and macOS.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/001 | 1 -
 tests/qemu-iotests/002 | 1 -
 tests/qemu-iotests/003 | 1 -
 tests/qemu-iotests/004 | 1 -
 tests/qemu-iotests/005 | 1 -
 tests/qemu-iotests/007 | 1 -
 tests/qemu-iotests/008 | 1 -
 tests/qemu-iotests/009 | 1 -
 tests/qemu-iotests/010 | 1 -
 tests/qemu-iotests/011 | 1 -
 tests/qemu-iotests/012 | 1 -
 tests/qemu-iotests/013 | 1 -
 tests/qemu-iotests/014 | 1 -
 tests/qemu-iotests/015 | 1 -
 tests/qemu-iotests/017 | 1 -
 tests/qemu-iotests/020 | 1 -
 tests/qemu-iotests/021 | 1 -
 tests/qemu-iotests/022 | 1 -
 tests/qemu-iotests/023 | 1 -
 tests/qemu-iotests/025 | 1 -
 tests/qemu-iotests/026 | 1 -
 tests/qemu-iotests/027 | 1 -
 tests/qemu-iotests/028 | 1 -
 tests/qemu-iotests/029 | 1 -
 tests/qemu-iotests/031 | 1 -
 tests/qemu-iotests/032 | 1 -
 tests/qemu-iotests/033 | 1 -
 tests/qemu-iotests/035 | 1 -
 tests/qemu-iotests/036 | 1 -
 tests/qemu-iotests/037 | 1 -
 tests/qemu-iotests/042 | 1 -
 tests/qemu-iotests/043 | 1 -
 tests/qemu-iotests/046 | 1 -
 tests/qemu-iotests/047 | 1 -
 tests/qemu-iotests/049 | 1 -
 tests/qemu-iotests/050 | 1 -
 tests/qemu-iotests/051 | 1 -
 tests/qemu-iotests/052 | 1 -
 tests/qemu-iotests/053 | 1 -
 tests/qemu-iotests/054 | 1 -
 tests/qemu-iotests/060 | 1 -
 tests/qemu-iotests/061 | 1 -
 tests/qemu-iotests/062 | 1 -
 tests/qemu-iotests/063 | 1 -
 tests/qemu-iotests/066 | 1 -
 tests/qemu-iotests/067 | 1 -
 tests/qemu-iotests/068 | 1 -
 tests/qemu-iotests/069 | 1 -
 tests/qemu-iotests/071 | 1 -
 tests/qemu-iotests/072 | 1 -
 tests/qemu-iotests/073 | 1 -
 tests/qemu-iotests/079 | 1 -
 tests/qemu-iotests/080 | 1 -
 tests/qemu-iotests/082 | 1 -
 tests/qemu-iotests/085 | 1 -
 tests/qemu-iotests/089 | 1 -
 tests/qemu-iotests/090 | 1 -
 tests/qemu-iotests/091 | 1 -
 tests/qemu-iotests/094 | 1 -
 tests/qemu-iotests/095 | 1 -
 tests/qemu-iotests/097 | 1 -
 tests/qemu-iotests/098 | 1 -
 tests/qemu-iotests/102 | 1 -
 tests/qemu-iotests/103 | 1 -
 tests/qemu-iotests/104 | 1 -
 tests/qemu-iotests/105 | 1 -
 tests/qemu-iotests/107 | 1 -
 tests/qemu-iotests/110 | 1 -
 tests/qemu-iotests/111 | 1 -
 tests/qemu-iotests/112 | 1 -
 tests/qemu-iotests/114 | 1 -
 tests/qemu-iotests/115 | 1 -
 tests/qemu-iotests/117 | 1 -
 tests/qemu-iotests/120 | 1 -
 tests/qemu-iotests/121 | 1 -
 tests/qemu-iotests/122 | 1 -
 tests/qemu-iotests/125 | 1 -
 tests/qemu-iotests/126 | 1 -
 tests/qemu-iotests/127 | 1 -
 tests/qemu-iotests/130 | 1 -
 tests/qemu-iotests/133 | 1 -
 tests/qemu-iotests/134 | 1 -
 tests/qemu-iotests/137 | 1 -
 tests/qemu-iotests/138 | 1 -
 tests/qemu-iotests/141 | 1 -
 tests/qemu-iotests/142 | 1 -
 tests/qemu-iotests/143 | 1 -
 tests/qemu-iotests/144 | 1 -
 tests/qemu-iotests/145 | 1 -
 tests/qemu-iotests/153 | 1 -
 tests/qemu-iotests/156 | 1 -
 tests/qemu-iotests/157 | 1 -
 tests/qemu-iotests/158 | 1 -
 tests/qemu-iotests/159 | 1 -
 tests/qemu-iotests/161 | 1 -
 tests/qemu-iotests/162 | 1 -
 tests/qemu-iotests/170 | 1 -
 tests/qemu-iotests/172 | 1 -
 tests/qemu-iotests/173 | 1 -
 tests/qemu-iotests/176 | 1 -
 tests/qemu-iotests/178 | 1 -
 tests/qemu-iotests/181 | 1 -
 tests/qemu-iotests/182 | 1 -
 tests/qemu-iotests/183 | 1 -
 tests/qemu-iotests/185 | 1 -
 tests/qemu-iotests/186 | 1 -
 tests/qemu-iotests/187 | 1 -
 tests/qemu-iotests/189 | 1 -
 tests/qemu-iotests/190 | 1 -
 tests/qemu-iotests/191 | 1 -
 tests/qemu-iotests/192 | 1 -
 tests/qemu-iotests/195 | 1 -
 tests/qemu-iotests/197 | 1 -
 tests/qemu-iotests/198 | 1 -
 tests/qemu-iotests/200 | 1 -
 tests/qemu-iotests/201 | 1 -
 tests/qemu-iotests/214 | 1 -
 tests/qemu-iotests/215 | 1 -
 tests/qemu-iotests/217 | 1 -
 tests/qemu-iotests/220 | 1 -
 tests/qemu-iotests/227 | 1 -
 tests/qemu-iotests/229 | 1 -
 tests/qemu-iotests/231 | 1 -
 tests/qemu-iotests/232 | 1 -
 tests/qemu-iotests/233 | 1 -
 tests/qemu-iotests/240 | 1 -
 tests/qemu-iotests/247 | 1 -
 127 files changed, 127 deletions(-)

diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001
index 5d266e170a..d87a535c33 100755
--- a/tests/qemu-iotests/001
+++ b/tests/qemu-iotests/001
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002
index 7fb85084a1..fd413bce48 100755
--- a/tests/qemu-iotests/002
+++ b/tests/qemu-iotests/002
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003
index f008c57cdc..ccd3a39dfb 100755
--- a/tests/qemu-iotests/003
+++ b/tests/qemu-iotests/003
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 size=128M
 offset=67M
diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004
index 64fab3e714..d308dc4b49 100755
--- a/tests/qemu-iotests/004
+++ b/tests/qemu-iotests/004
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt raw qcow qcow2 qed vdi vmdk vhdx luks
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
index 2fef63af88..f909eb1cc1 100755
--- a/tests/qemu-iotests/005
+++ b/tests/qemu-iotests/005
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
                      "subformat=twoGbMaxExtentSparse"
 
diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
index 3ab5490db3..6abd402423 100755
--- a/tests/qemu-iotests/007
+++ b/tests/qemu-iotests/007
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # currently only qcow2 allows for consistency checks using qemu-img
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 # refcount_bits must be at least 4 so we can create ten internal snapshots
 # (1 bit supports none, 2 bits support two, 4 bits support 14)
 _unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]'
diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008
index 75067e36ad..2b81b119bf 100755
--- a/tests/qemu-iotests/008
+++ b/tests/qemu-iotests/008
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
index bc4b461122..51b200db1d 100755
--- a/tests/qemu-iotests/009
+++ b/tests/qemu-iotests/009
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=6G
diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
index 6920408d28..48c533f632 100755
--- a/tests/qemu-iotests/010
+++ b/tests/qemu-iotests/010
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=6G
diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
index b4c7e8f799..8b1fce069a 100755
--- a/tests/qemu-iotests/011
+++ b/tests/qemu-iotests/011
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=6G
diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012
index 2c3b42d9dd..12957285b3 100755
--- a/tests/qemu-iotests/012
+++ b/tests/qemu-iotests/012
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 
 # Remove once all tests are fixed to use TEST_IMG_FILE
 # correctly and common.rc sets it unconditionally
diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013
index 5cb9032f16..8e9892e9ee 100755
--- a/tests/qemu-iotests/013
+++ b/tests/qemu-iotests/013
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # much of this could be generic for any format supporting compression.
 _supported_fmt qcow qcow2
 _supported_proto file
-_supported_os Linux
 
 TEST_OFFSETS="0 4294967296"
 TEST_OPS="writev read write readv"
diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014
index 2f728a1956..9395bec60b 100755
--- a/tests/qemu-iotests/014
+++ b/tests/qemu-iotests/014
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # much of this could be generic for any format supporting snapshots
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 TEST_OFFSETS="0 4294967296"
 TEST_OPS="writev read write readv"
diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
index 5a4063e4f5..eec5387f3d 100755
--- a/tests/qemu-iotests/015
+++ b/tests/qemu-iotests/015
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # actually any format that supports snapshots
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 # Internal snapshots are (currently) impossible with refcount_bits=1
 _unsupported_imgopts 'refcount_bits=1[^0-9]'
 
diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index 83744f29a3..79875de454 100755
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 TEST_OFFSETS="0 4294967296"
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index 71fa753b4e..6b0ebb37d2 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto file
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
                      "subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021
index f6555f3b74..f888269fd4 100755
--- a/tests/qemu-iotests/021
+++ b/tests/qemu-iotests/021
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022
index b68cd64b33..99eb08f57f 100755
--- a/tests/qemu-iotests/022
+++ b/tests/qemu-iotests/022
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format that supports snapshots
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 TEST_OFFSETS="10485760 4294967296"
 CLUSTER_SIZE="4096"
diff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023
index 02ed047820..f96d8c08b7 100755
--- a/tests/qemu-iotests/023
+++ b/tests/qemu-iotests/023
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # much of this could be generic for any format supporting compression.
 _supported_fmt qcow qcow2
 _supported_proto file
-_supported_os Linux
 
 TEST_OFFSETS="0 4294967296"
 TEST_OPS="writev read write readv"
diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025
index d9a4ebc5e7..e05d833452 100755
--- a/tests/qemu-iotests/025
+++ b/tests/qemu-iotests/025
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt raw qcow2 qed luks
 _supported_proto file sheepdog rbd nfs
-_supported_os Linux
 
 echo "=== Creating image"
 echo
diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
index ca89ad7048..e30243608b 100755
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Currently only qcow2 supports rebasing
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 _default_cache_mode "writethrough"
 _supported_cache_modes "writethrough" "none"
 # The refcount table tests expect a certain minimum width for refcount entries
diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027
index b7df9701f7..4cb638022a 100755
--- a/tests/qemu-iotests/027
+++ b/tests/qemu-iotests/027
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt vmdk qcow qcow2 qed
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
index 01f495912f..08bc5cc8ec 100755
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028
@@ -47,7 +47,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # smaller backing files.
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 # Choose a size that is not necessarily a cluster size multiple for image
 # formats that use clusters.  This will ensure that the base image doesn't end
diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
index 5f42f76cc6..94c2713132 100755
--- a/tests/qemu-iotests/029
+++ b/tests/qemu-iotests/029
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 # Internal snapshots are (currently) impossible with refcount_bits=1
 _unsupported_imgopts 'refcount_bits=1[^0-9]'
 
diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
index ef92d8eee3..a3c25ec237 100755
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 CLUSTER_SIZE=65536
 
diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032
index a1757bb15e..23c216c549 100755
--- a/tests/qemu-iotests/032
+++ b/tests/qemu-iotests/032
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This works for any image format (though unlikely to segfault for raw)
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 echo
 echo === Prepare image ===
diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033
index cfdf1ec2ba..362a48c0a0 100755
--- a/tests/qemu-iotests/033
+++ b/tests/qemu-iotests/033
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035
index 46aa835936..ad6fa3115a 100755
--- a/tests/qemu-iotests/035
+++ b/tests/qemu-iotests/035
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 
 size=6G
diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index 1b56394129..f06ff67408 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 # Only qcow2v3 and later supports feature bits
 IMGOPTS="compat=1.1"
diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037
index 0781bebefe..819a2a52d2 100755
--- a/tests/qemu-iotests/037
+++ b/tests/qemu-iotests/037
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto file
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
                      "subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042
index a9a7fc3041..0e85b356b7 100755
--- a/tests/qemu-iotests/042
+++ b/tests/qemu-iotests/042
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 echo
 echo "== Creating zero size image =="
diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
index 9894b154ec..67cc7e74c2 100755
--- a/tests/qemu-iotests/043
+++ b/tests/qemu-iotests/043
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
index 95160bea4c..543355c64f 100755
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 CLUSTER_SIZE=64k
 size=128M
diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047
index ce81fc6fa7..4528465fb0 100755
--- a/tests/qemu-iotests/047
+++ b/tests/qemu-iotests/047
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 size=128M
 
diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049
index bc09cd6717..c100d30ed0 100755
--- a/tests/qemu-iotests/049
+++ b/tests/qemu-iotests/049
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 filter_test_dir()
 {
diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
index dd7b2c72eb..211fc00797 100755
--- a/tests/qemu-iotests/050
+++ b/tests/qemu-iotests/050
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then
   IMGOPTS=compat=1.1
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index 02ac960da4..a3deb1fcad 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # A compat=0.10 image is created in this test which does not support anything
 # other than refcount_bits=16
 _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052
index b3a2dc1143..6e2ecbfe21 100755
--- a/tests/qemu-iotests/052
+++ b/tests/qemu-iotests/052
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 
 # Don't do O_DIRECT on tmpfs
 _supported_cache_modes "writeback" "writethrough" "unsafe"
diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
index 50c62f0f56..e82bb69881 100755
--- a/tests/qemu-iotests/053
+++ b/tests/qemu-iotests/053
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 qcow
 _supported_proto file
-_supported_os Linux
 
 echo
 echo "== Creating single sector image =="
diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054
index 0d5e14f847..a8905b60d0 100755
--- a/tests/qemu-iotests/054
+++ b/tests/qemu-iotests/054
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 echo
 echo "creating too large image (1 EB)"
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index 89e911400c..b65a505199 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -47,7 +47,6 @@ _filter_io_error()
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 rt_offset=65536  # 0x10000 (XXX: just an assumption)
 rb_offset=131072 # 0x20000 (XXX: just an assumption)
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index d7dbd7e2c7..b7e2e27b96 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 echo
 echo "=== Testing version downgrade with zero expansion ==="
diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
index ed7400fed2..d5f818fcce 100755
--- a/tests/qemu-iotests/062
+++ b/tests/qemu-iotests/062
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 IMGOPTS="compat=1.1"
 IMG_SIZE=64M
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index 2d5c0ce9fb..fe4892e467 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow qcow2 vmdk qed raw
 _supported_proto file
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
                      "subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
index f480986e35..28f8c98412 100755
--- a/tests/qemu-iotests/066
+++ b/tests/qemu-iotests/066
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 # Intentionally create an unaligned image
 IMGOPTS="compat=1.1"
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index fda16a6b0d..926c79b37c 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -32,7 +32,6 @@ status=1	# failure is the default!
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # Because anything other than 16 would change the output of query-block
 _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
 
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index 881a022107..22f5ca3ba6 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 IMGOPTS="compat=1.1"
 IMG_SIZE=128K
diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
index 6a8e4aa22e..3974714852 100755
--- a/tests/qemu-iotests/069
+++ b/tests/qemu-iotests/069
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qed qcow qcow2 vmdk
 _supported_proto file
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 IMG_SIZE=128K
diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index 7f3e5abd57..1cca9233d0 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072
index 6f9f247fa5..661b36da2d 100755
--- a/tests/qemu-iotests/072
+++ b/tests/qemu-iotests/072
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow
 _supported_proto file
-_supported_os Linux
 
 IMG_SIZE=64M
 
diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
index 990f90acbd..e684b1b780 100755
--- a/tests/qemu-iotests/073
+++ b/tests/qemu-iotests/073
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 
 CLUSTER_SIZE=64k
 size=128M
diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
index 1b6594ebef..81f0c21f53 100755
--- a/tests/qemu-iotests/079
+++ b/tests/qemu-iotests/079
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
-_supported_os Linux
 
 echo "=== Check option preallocation and cluster_size ==="
 echo
diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
index 4bcb5021e8..46d7898e84 100755
--- a/tests/qemu-iotests/080
+++ b/tests/qemu-iotests/080
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # - Internal snapshots are (currently) impossible with refcount_bits=1
 # - This is generally a test for compat=1.1 images
 _unsupported_imgopts 'refcount_bits=1[^0-9]' 'compat=0.10'
diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
index d0afa46e9a..d084a0844d 100755
--- a/tests/qemu-iotests/082
+++ b/tests/qemu-iotests/082
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
-_supported_os Linux
 
 run_qemu_img()
 {
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
index 68cb665987..d40fdab542 100755
--- a/tests/qemu-iotests/085
+++ b/tests/qemu-iotests/085
@@ -56,7 +56,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 
 # ${1}: unique identifier for the snapshot filename
diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089
index 6609954908..ad029f1f09 100755
--- a/tests/qemu-iotests/089
+++ b/tests/qemu-iotests/089
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # Because anything other than 16 would change the output of qemu_io -c info
 _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
 
diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090
index 193bae7d77..9f8cfbb80f 100755
--- a/tests/qemu-iotests/090
+++ b/tests/qemu-iotests/090
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
-_supported_os Linux
 
 IMG_SIZE=128K
 
diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
index d62ef18a02..390e623c0c 100755
--- a/tests/qemu-iotests/091
+++ b/tests/qemu-iotests/091
@@ -45,7 +45,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 _default_cache_mode "none"
 _supported_cache_modes "writethrough" "none" "writeback"
 
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index 0bcca77261..9343e09492 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto nbd
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 _make_test_img 64M
diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
index 18505b7181..58fe174b5e 100755
--- a/tests/qemu-iotests/095
+++ b/tests/qemu-iotests/095
@@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 size_smaller=5M
 size_larger=100M
diff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097
index 690f3d3ce1..23988f5181 100755
--- a/tests/qemu-iotests/097
+++ b/tests/qemu-iotests/097
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files and bdrv_make_empty
 _supported_fmt qcow qcow2
 _supported_proto file
-_supported_os Linux
 
 
 # Four main passes:
diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
index 461144c831..1c1d1c468f 100755
--- a/tests/qemu-iotests/098
+++ b/tests/qemu-iotests/098
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 IMGOPTS="compat=1.1"
 
diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
index cedd2b25dc..749ff66b8a 100755
--- a/tests/qemu-iotests/102
+++ b/tests/qemu-iotests/102
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 IMG_SIZE=64K
 
diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
index 6773e94d9f..554b9de054 100755
--- a/tests/qemu-iotests/103
+++ b/tests/qemu-iotests/103
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
-_supported_os Linux
 # Internal snapshots are (currently) impossible with refcount_bits=1
 _unsupported_imgopts 'refcount_bits=1[^0-9]'
 
diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104
index 390167bad4..c70f28a9a1 100755
--- a/tests/qemu-iotests/104
+++ b/tests/qemu-iotests/104
@@ -34,7 +34,6 @@ trap "exit \$status" 0 1 2 3 15
 
 _supported_fmt raw qcow qcow2 qed vdi vmdk vhdx
 _supported_proto generic
-_supported_os Linux
 
 echo "=== Check qemu-img info output ==="
 echo
diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105
index 3b5a596844..3346e8cb25 100755
--- a/tests/qemu-iotests/105
+++ b/tests/qemu-iotests/105
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 vmdk vhdx qed
 _supported_proto generic
-_supported_os Linux
 _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
                      "subformat=twoGbMaxExtentSparse"
 
diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107
index fcd5a24dfe..268ba27688 100755
--- a/tests/qemu-iotests/107
+++ b/tests/qemu-iotests/107
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file nfs
-_supported_os Linux
 
 
 IMG_SIZE=64K
diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index fad672c1ae..4318341ac5 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files
 _supported_fmt qed qcow qcow2 vmdk
 _supported_proto file
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 TEST_IMG_REL=$(basename "$TEST_IMG")
diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
index 57395be64c..490a5bbcb5 100755
--- a/tests/qemu-iotests/111
+++ b/tests/qemu-iotests/111
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qed qcow qcow2 vmdk
 _supported_proto file
-_supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 $QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
index 6d81c75a9c..706c10b600 100755
--- a/tests/qemu-iotests/112
+++ b/tests/qemu-iotests/112
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # This test will set refcount_bits on its own which would conflict with the
 # manual setting; compat will be overridden as well
 _unsupported_imgopts refcount_bits 'compat=0.10'
diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
index f36b88f3f3..f90a744fc0 100755
--- a/tests/qemu-iotests/114
+++ b/tests/qemu-iotests/114
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 
 
 TEST_IMG="$TEST_IMG.base" _make_test_img 64M
diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
index 7ed347010f..9ed3cb6a83 100755
--- a/tests/qemu-iotests/115
+++ b/tests/qemu-iotests/115
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # This test relies on refcounts being 64 bits wide (which does not work with
 # compat=0.10)
 _unsupported_imgopts 'refcount_bits=\([^6]\|.\([^4]\|$\)\)' 'compat=0.10'
diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
index 0af0f31c5a..f37b34f8b1 100755
--- a/tests/qemu-iotests/117
+++ b/tests/qemu-iotests/117
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 _make_test_img 64k
 
diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120
index ca95b9276e..e9b4fbb009 100755
--- a/tests/qemu-iotests/120
+++ b/tests/qemu-iotests/120
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 _unsupported_fmt luks
 
 _make_test_img 64M
diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
index 90a0424edb..cf67728d72 100755
--- a/tests/qemu-iotests/121
+++ b/tests/qemu-iotests/121
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 echo
 echo '=== New refcount structures may not conflict with existing structures ==='
diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122
index 85c3a8d047..88bb6cec72 100755
--- a/tests/qemu-iotests/122
+++ b/tests/qemu-iotests/122
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 
 TEST_IMG="$TEST_IMG".base _make_test_img 64M
diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
index 212dcd8f0d..dc4b8f5fb9 100755
--- a/tests/qemu-iotests/125
+++ b/tests/qemu-iotests/125
@@ -44,7 +44,6 @@ get_image_size_on_host()
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 if [ -z "$TEST_IMG_FILE" ]; then
     TEST_IMG_FILE=$TEST_IMG
diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126
index 96dc048d59..580fae5d62 100755
--- a/tests/qemu-iotests/126
+++ b/tests/qemu-iotests/126
@@ -37,7 +37,6 @@ _supported_fmt qcow qcow2 qed vmdk
 # colons which separate a protocol prefix from the rest and colons which are
 # just part of the filename, so we cannot test protocols which require a prefix)
 _supported_proto file
-_supported_os Linux
 
 echo
 echo '=== Testing plain files ==='
diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127
index 3e941f74d4..b64926ab31 100755
--- a/tests/qemu-iotests/127
+++ b/tests/qemu-iotests/127
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 IMG_SIZE=64K
 
diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
index 77ad2aa13a..c64ef5e906 100755
--- a/tests/qemu-iotests/130
+++ b/tests/qemu-iotests/130
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 # We are going to use lazy-refcounts
 _unsupported_imgopts 'compat=0.10'
 
diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133
index 1f6056d144..6f7cacc091 100755
--- a/tests/qemu-iotests/133
+++ b/tests/qemu-iotests/133
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 TEST_IMG="$TEST_IMG.base" _make_test_img 64M
 _make_test_img -b "$TEST_IMG.base"
diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134
index e9e3e84c2a..141a2eaa7e 100755
--- a/tests/qemu-iotests/134
+++ b/tests/qemu-iotests/134
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
index 0c3d2a1cf0..915eb2d62b 100755
--- a/tests/qemu-iotests/137
+++ b/tests/qemu-iotests/137
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # We are going to use lazy-refcounts
 _unsupported_imgopts 'compat=0.10'
 
diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
index f353ac8219..736153a484 100755
--- a/tests/qemu-iotests/138
+++ b/tests/qemu-iotests/138
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 echo
 echo '=== Check on an image with a multiple of 2^32 clusters ==='
diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
index 2197a82d45..34ed9676b0 100755
--- a/tests/qemu-iotests/141
+++ b/tests/qemu-iotests/141
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Needs backing file and backing format support
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 
 test_blockjob()
diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142
index d9b98cf60a..6b62271876 100755
--- a/tests/qemu-iotests/142
+++ b/tests/qemu-iotests/142
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 # We test all cache modes anyway, but O_DIRECT needs to be supported
 _default_cache_mode none
diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
index c223867cb3..92249ac8da 100755
--- a/tests/qemu-iotests/143
+++ b/tests/qemu-iotests/143
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 keep_stderr=y \
 _launch_qemu 2> >(_filter_nbd)
diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
index 15157f33d7..011ed4f2bc 100755
--- a/tests/qemu-iotests/144
+++ b/tests/qemu-iotests/144
@@ -46,7 +46,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 size=512M
 
diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145
index 28878dc8a1..9427549651 100755
--- a/tests/qemu-iotests/145
+++ b/tests/qemu-iotests/145
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 _make_test_img 1M
 
diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
index 08ad8a6730..c969a1a16f 100755
--- a/tests/qemu-iotests/153
+++ b/tests/qemu-iotests/153
@@ -62,7 +62,6 @@ _check_ofd || _notrun "OFD lock not available"
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 _run_cmd()
 {
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index 8d134029c6..2ffa3ca942 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -49,7 +49,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2 qed
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 
 # Create source disk
 TEST_IMG="$TEST_IMG.backing" _make_test_img 1M
diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157
index 69b25cab30..7cbac38099 100755
--- a/tests/qemu-iotests/157
+++ b/tests/qemu-iotests/157
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158
index 8c0928a7f9..ba4db6116a 100755
--- a/tests/qemu-iotests/158
+++ b/tests/qemu-iotests/158
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow qcow2
 _supported_proto generic
 _unsupported_proto vxhs
-_supported_os Linux
 
 
 size=128M
diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159
index 29066eebde..2557140ac2 100755
--- a/tests/qemu-iotests/159
+++ b/tests/qemu-iotests/159
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 _unsupported_fmt luks
 
 TEST_SIZES="5 512 1024 1999 1K 64K 1M"
diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161
index 456a4bd8c4..d46e3ba485 100755
--- a/tests/qemu-iotests/161
+++ b/tests/qemu-iotests/161
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format implementing BlockDriver.bdrv_change_backing_file
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 IMG_SIZE=1M
 
diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
index 2e9947fd9a..4e5ed74fd5 100755
--- a/tests/qemu-iotests/162
+++ b/tests/qemu-iotests/162
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt generic
-_supported_os Linux
 
 test_ssh=$($QEMU_IMG --help | grep '^Supported formats:.* ssh\( \|$\)')
 [ "$test_ssh" = "" ] && _notrun "ssh support required"
diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170
index 7deb7563c9..05dd6ed6c3 100755
--- a/tests/qemu-iotests/170
+++ b/tests/qemu-iotests/170
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 _unsupported_fmt luks
 
 echo
diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172
index ba7dad9057..2e78900c98 100755
--- a/tests/qemu-iotests/172
+++ b/tests/qemu-iotests/172
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
     _notrun "Requires a PC machine"
diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
index 47036a5564..9e2fa2e73c 100755
--- a/tests/qemu-iotests/173
+++ b/tests/qemu-iotests/173
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto nfs
-_supported_os Linux
 
 size=100M
 
diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176
index 50df4c00fa..a8bdbf1628 100755
--- a/tests/qemu-iotests/176
+++ b/tests/qemu-iotests/176
@@ -46,7 +46,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This test is specific to qcow2
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 # Persistent dirty bitmaps require compat=1.1
 _unsupported_imgopts 'compat=0.10'
 
diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
index 21231cadd3..dc371a0ae6 100755
--- a/tests/qemu-iotests/178
+++ b/tests/qemu-iotests/178
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt raw qcow2
 _supported_proto file
-_supported_os Linux
 
 echo "== Input validation =="
 echo
diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181
index e317e63422..c62c6c36ae 100755
--- a/tests/qemu-iotests/181
+++ b/tests/qemu-iotests/181
@@ -45,7 +45,6 @@ _supported_fmt generic
 # Formats that do not support live migration
 _unsupported_fmt qcow vdi vhdx vmdk vpc vvfat parallels
 _supported_proto generic
-_supported_os Linux
 
 size=64M
 _make_test_img $size
diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
index ff3d7e7ec1..fd7627fb65 100755
--- a/tests/qemu-iotests/182
+++ b/tests/qemu-iotests/182
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 size=32M
 
diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
index 93b7bd798a..fbe5a99beb 100755
--- a/tests/qemu-iotests/183
+++ b/tests/qemu-iotests/183
@@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 raw qed quorum
 _supported_proto file
-_supported_os Linux
 
 size=64M
 _make_test_img $size
diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185
index 454ff600cc..6358ebeea5 100755
--- a/tests/qemu-iotests/185
+++ b/tests/qemu-iotests/185
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 size=64M
 TEST_IMG="${TEST_IMG}.base" _make_test_img $size
diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186
index 5dd2177b89..7e7d45babc 100755
--- a/tests/qemu-iotests/186
+++ b/tests/qemu-iotests/186
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
     _notrun "Requires a PC machine"
diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
index a45addde09..2fcef9e2bd 100755
--- a/tests/qemu-iotests/187
+++ b/tests/qemu-iotests/187
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 size=64M
 _make_test_img $size
diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189
index c9ce9d3bed..e9daa4df73 100755
--- a/tests/qemu-iotests/189
+++ b/tests/qemu-iotests/189
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 
 size=16M
diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
index e1c1d407f0..eb766ad09f 100755
--- a/tests/qemu-iotests/190
+++ b/tests/qemu-iotests/190
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # See 178 for more extensive tests across more formats
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 echo "== Huge file =="
 echo
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index 1ea908ce3d..528022e8d8 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 size=64M
 
diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
index 158086f9d2..84d1ed7cfa 100755
--- a/tests/qemu-iotests/192
+++ b/tests/qemu-iotests/192
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 
 if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
     _notrun "Requires a PC machine"
diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
index bd1b71ae5e..ef7b9a94e2 100755
--- a/tests/qemu-iotests/195
+++ b/tests/qemu-iotests/195
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index 2c664793f4..383d7d7f61 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -51,7 +51,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Test is supported for any backing file; but we force qcow2 for our wrapper.
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 # LUKS support may be possible, but it complicates things.
 _unsupported_fmt luks
 
diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
index c8f824cfae..c7aca42abc 100755
--- a/tests/qemu-iotests/198
+++ b/tests/qemu-iotests/198
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 
 size=16M
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index 1c0f8cafc2..72d431f251 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 BACKING_IMG="${TEST_DIR}/backing.img"
 TEST_IMG="${TEST_DIR}/test.img"
diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201
index 7abf740fe4..6705532758 100755
--- a/tests/qemu-iotests/201
+++ b/tests/qemu-iotests/201
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
-_supported_os Linux
 
 # Internal snapshots are (currently) impossible with refcount_bits=1
 # This was taken from test 080
diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
index c1a452ff9a..21ec8a2ad8 100755
--- a/tests/qemu-iotests/214
+++ b/tests/qemu-iotests/214
@@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 # Repairing the corrupted image requires qemu-img check to store a
 # refcount up to 3, which requires at least two refcount bits.
diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index 7b063d7cfa..958c14f5a0 100755
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215
@@ -48,7 +48,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Test is supported for any backing file; but we force qcow2 for our wrapper.
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 # LUKS support may be possible, but it complicates things.
 _unsupported_fmt luks
 
diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217
index f5482bb669..58a78a6098 100755
--- a/tests/qemu-iotests/217
+++ b/tests/qemu-iotests/217
@@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This test is specific to qcow2
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 # This test needs clusters with at least a refcount of 2 so that
 # OFLAG_COPIED is not set.  refcount_bits=1 is therefore unsupported.
diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
index 2d62c5dcac..14f8f197a0 100755
--- a/tests/qemu-iotests/220
+++ b/tests/qemu-iotests/220
@@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
-_supported_os Linux
 
 echo "== Creating huge file =="
 
diff --git a/tests/qemu-iotests/227 b/tests/qemu-iotests/227
index 10cf144eb0..bdd727a721 100755
--- a/tests/qemu-iotests/227
+++ b/tests/qemu-iotests/227
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
index e18a464fe0..750b22f582 100755
--- a/tests/qemu-iotests/229
+++ b/tests/qemu-iotests/229
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Needs backing file and backing format support
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 
 DEST_IMG="$TEST_DIR/d.$IMGFMT"
diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231
index 5b2cbab9ac..c0b053ac30 100755
--- a/tests/qemu-iotests/231
+++ b/tests/qemu-iotests/231
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto rbd
-_supported_os Linux
 
 BOGUS_CONF=${TEST_DIR}/ceph-$$.conf
 touch "${BOGUS_CONF}"
diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
index 2063f78876..374d38dce2 100755
--- a/tests/qemu-iotests/232
+++ b/tests/qemu-iotests/232
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto file
-_supported_os Linux
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233
index b8b6c8cc4c..5855f94b9a 100755
--- a/tests/qemu-iotests/233
+++ b/tests/qemu-iotests/233
@@ -47,7 +47,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt raw qcow2
 _supported_proto file
 # If porting to non-Linux, consider using socat instead of ss in common.nbd
-_supported_os Linux
 _require_command QEMU_NBD
 
 nbd_server_set_tcp_port
diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
index d3e663ed65..b4cf95096d 100755
--- a/tests/qemu-iotests/240
+++ b/tests/qemu-iotests/240
@@ -33,7 +33,6 @@ status=1	# failure is the default!
 
 _supported_fmt generic
 _supported_proto generic
-_supported_os Linux
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
index fc50eb5dc1..546a794d3d 100755
--- a/tests/qemu-iotests/247
+++ b/tests/qemu-iotests/247
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Requires backing files and .bdrv_change_backing_file support
 _supported_fmt qcow2 qed
 _supported_proto file
-_supported_os Linux
 
 size=128M
 
-- 
2.21.0

Re: [Qemu-devel] [PATCH 0/6] tests/qemu-iotests: Run basic iotests during "make check"

[no-reply]

Patchew URL: https://patchew.org/QEMU/20190424103747.10173-1-thuth@redhat.com/



Hi,

This series failed the asan build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
=== TEST SCRIPT END ===




The full log is available at
http://patchew.org/logs/20190424103747.10173-1-thuth@redhat.com/testing.asan/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

Re: [Qemu-devel] [PATCH 0/6] tests/qemu-iotests: Run basic iotests during "make check"

[no-reply]

Patchew URL: https://patchew.org/QEMU/20190424103747.10173-1-thuth@redhat.com/



Hi,

This series failed the asan build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
=== TEST SCRIPT END ===




The full log is available at
http://patchew.org/logs/20190424103747.10173-1-thuth@redhat.com/testing.asan/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

Re: [Qemu-devel] [PATCH 0/6] tests/qemu-iotests: Run basic iotests during "make check"

[Christian Borntraeger]

On 24.04.19 12:37, Thomas Huth wrote:
> People often forget to run the iotests before submitting patches or
> pull requests - this is likely due to the fact that we do not run the
> tests during our mandatory "make check" tests yet.
> This patch series now introduces a new "ci" iotests group that should
> be safe to run in all CI environments (including FreeBSD and macOS!).
> Thus these iotests can now always be run during "make check" automati-
> cally, too.

Given that the iotests have been broken heavily immediately after the 4.0
release (e.g. by a qemu-io change) consider the series

Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>


> 
> Thomas Huth (6):
>   tests/qemu-iotests/check: Pick a default machine if necessary
>   tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines
>   tests/qemu-iotests: Do not hard-code the path to bash
>   cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
>   tests: Run the iotests during "make check" again
>   tests/qemu-iotests: Remove the "_supported_os Linux" line from many
>     tests
> 
>  .cirrus.yml                 |   4 +-
>  .travis.yml                 |   1 +
>  tests/Makefile.include      |   2 +-
>  tests/qemu-iotests-quick.sh |  17 +++-
>  tests/qemu-iotests/001      |   1 -
>  tests/qemu-iotests/002      |   1 -
>  tests/qemu-iotests/003      |   1 -
>  tests/qemu-iotests/004      |   1 -
>  tests/qemu-iotests/005      |   1 -
>  tests/qemu-iotests/007      |   1 -
>  tests/qemu-iotests/008      |   1 -
>  tests/qemu-iotests/009      |   1 -
>  tests/qemu-iotests/010      |   1 -
>  tests/qemu-iotests/011      |   1 -
>  tests/qemu-iotests/012      |   1 -
>  tests/qemu-iotests/013      |   1 -
>  tests/qemu-iotests/014      |   1 -
>  tests/qemu-iotests/015      |   1 -
>  tests/qemu-iotests/017      |   1 -
>  tests/qemu-iotests/020      |   1 -
>  tests/qemu-iotests/021      |   1 -
>  tests/qemu-iotests/022      |   1 -
>  tests/qemu-iotests/023      |   1 -
>  tests/qemu-iotests/025      |   1 -
>  tests/qemu-iotests/026      |   1 -
>  tests/qemu-iotests/027      |   1 -
>  tests/qemu-iotests/028      |   1 -
>  tests/qemu-iotests/029      |   1 -
>  tests/qemu-iotests/031      |   1 -
>  tests/qemu-iotests/032      |   1 -
>  tests/qemu-iotests/033      |   1 -
>  tests/qemu-iotests/035      |   1 -
>  tests/qemu-iotests/036      |   1 -
>  tests/qemu-iotests/037      |   1 -
>  tests/qemu-iotests/042      |   1 -
>  tests/qemu-iotests/043      |   1 -
>  tests/qemu-iotests/046      |   1 -
>  tests/qemu-iotests/047      |   1 -
>  tests/qemu-iotests/049      |   1 -
>  tests/qemu-iotests/050      |   1 -
>  tests/qemu-iotests/051      |   1 -
>  tests/qemu-iotests/052      |   1 -
>  tests/qemu-iotests/053      |   1 -
>  tests/qemu-iotests/054      |   1 -
>  tests/qemu-iotests/060      |   1 -
>  tests/qemu-iotests/061      |   1 -
>  tests/qemu-iotests/062      |   1 -
>  tests/qemu-iotests/063      |   1 -
>  tests/qemu-iotests/066      |   1 -
>  tests/qemu-iotests/067      |   1 -
>  tests/qemu-iotests/068      |   1 -
>  tests/qemu-iotests/069      |   1 -
>  tests/qemu-iotests/071      |   1 -
>  tests/qemu-iotests/072      |   1 -
>  tests/qemu-iotests/073      |   1 -
>  tests/qemu-iotests/079      |   1 -
>  tests/qemu-iotests/080      |   1 -
>  tests/qemu-iotests/082      |   1 -
>  tests/qemu-iotests/085      |   1 -
>  tests/qemu-iotests/089      |   1 -
>  tests/qemu-iotests/090      |   1 -
>  tests/qemu-iotests/091      |   1 -
>  tests/qemu-iotests/094      |   1 -
>  tests/qemu-iotests/095      |   1 -
>  tests/qemu-iotests/097      |   1 -
>  tests/qemu-iotests/098      |   1 -
>  tests/qemu-iotests/102      |   1 -
>  tests/qemu-iotests/103      |   1 -
>  tests/qemu-iotests/104      |   1 -
>  tests/qemu-iotests/105      |   1 -
>  tests/qemu-iotests/107      |   1 -
>  tests/qemu-iotests/110      |   1 -
>  tests/qemu-iotests/111      |   1 -
>  tests/qemu-iotests/112      |   1 -
>  tests/qemu-iotests/114      |   1 -
>  tests/qemu-iotests/115      |   1 -
>  tests/qemu-iotests/117      |   1 -
>  tests/qemu-iotests/120      |   1 -
>  tests/qemu-iotests/121      |   1 -
>  tests/qemu-iotests/122      |   1 -
>  tests/qemu-iotests/125      |   1 -
>  tests/qemu-iotests/126      |   1 -
>  tests/qemu-iotests/127      |   1 -
>  tests/qemu-iotests/130      |   1 -
>  tests/qemu-iotests/133      |   1 -
>  tests/qemu-iotests/134      |   1 -
>  tests/qemu-iotests/137      |   1 -
>  tests/qemu-iotests/138      |   1 -
>  tests/qemu-iotests/141      |   1 -
>  tests/qemu-iotests/142      |   1 -
>  tests/qemu-iotests/143      |   1 -
>  tests/qemu-iotests/144      |   1 -
>  tests/qemu-iotests/145      |   1 -
>  tests/qemu-iotests/153      |   1 -
>  tests/qemu-iotests/156      |   1 -
>  tests/qemu-iotests/157      |   1 -
>  tests/qemu-iotests/158      |   1 -
>  tests/qemu-iotests/159      |   1 -
>  tests/qemu-iotests/161      |   1 -
>  tests/qemu-iotests/162      |   1 -
>  tests/qemu-iotests/170      |   1 -
>  tests/qemu-iotests/172      |   1 -
>  tests/qemu-iotests/173      |   1 -
>  tests/qemu-iotests/176      |   1 -
>  tests/qemu-iotests/178      |   1 -
>  tests/qemu-iotests/181      |   1 -
>  tests/qemu-iotests/182      |   1 -
>  tests/qemu-iotests/183      |   1 -
>  tests/qemu-iotests/185      |   1 -
>  tests/qemu-iotests/186      |   1 -
>  tests/qemu-iotests/187      |   1 -
>  tests/qemu-iotests/189      |   1 -
>  tests/qemu-iotests/190      |   1 -
>  tests/qemu-iotests/191      |   1 -
>  tests/qemu-iotests/192      |   1 -
>  tests/qemu-iotests/195      |   1 -
>  tests/qemu-iotests/197      |   1 -
>  tests/qemu-iotests/198      |   1 -
>  tests/qemu-iotests/200      |   1 -
>  tests/qemu-iotests/201      |   1 -
>  tests/qemu-iotests/214      |   1 -
>  tests/qemu-iotests/215      |   1 -
>  tests/qemu-iotests/217      |   1 -
>  tests/qemu-iotests/220      |   1 -
>  tests/qemu-iotests/227      |   1 -
>  tests/qemu-iotests/229      |   1 -
>  tests/qemu-iotests/231      |   1 -
>  tests/qemu-iotests/232      |   1 -
>  tests/qemu-iotests/233      |   1 -
>  tests/qemu-iotests/239      |   2 +-
>  tests/qemu-iotests/240      |   3 +-
>  tests/qemu-iotests/241      |   2 +-
>  tests/qemu-iotests/243      |   2 +-
>  tests/qemu-iotests/244      |   2 +-
>  tests/qemu-iotests/247      |   1 -
>  tests/qemu-iotests/check    |  13 ++-
>  tests/qemu-iotests/group    | 194 +++++++++++++++++++-----------------
>  137 files changed, 139 insertions(+), 229 deletions(-)
> 

Re: [Qemu-devel] [PATCH 0/6] tests/qemu-iotests: Run basic iotests during "make check"

[Christian Borntraeger]

On 24.04.19 12:37, Thomas Huth wrote:
> People often forget to run the iotests before submitting patches or
> pull requests - this is likely due to the fact that we do not run the
> tests during our mandatory "make check" tests yet.
> This patch series now introduces a new "ci" iotests group that should
> be safe to run in all CI environments (including FreeBSD and macOS!).
> Thus these iotests can now always be run during "make check" automati-
> cally, too.

Given that the iotests have been broken heavily immediately after the 4.0
release (e.g. by a qemu-io change) consider the series

Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>


> 
> Thomas Huth (6):
>   tests/qemu-iotests/check: Pick a default machine if necessary
>   tests/qemu-iotests/group: Introduce a new "ci" group for CI pipelines
>   tests/qemu-iotests: Do not hard-code the path to bash
>   cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
>   tests: Run the iotests during "make check" again
>   tests/qemu-iotests: Remove the "_supported_os Linux" line from many
>     tests
> 
>  .cirrus.yml                 |   4 +-
>  .travis.yml                 |   1 +
>  tests/Makefile.include      |   2 +-
>  tests/qemu-iotests-quick.sh |  17 +++-
>  tests/qemu-iotests/001      |   1 -
>  tests/qemu-iotests/002      |   1 -
>  tests/qemu-iotests/003      |   1 -
>  tests/qemu-iotests/004      |   1 -
>  tests/qemu-iotests/005      |   1 -
>  tests/qemu-iotests/007      |   1 -
>  tests/qemu-iotests/008      |   1 -
>  tests/qemu-iotests/009      |   1 -
>  tests/qemu-iotests/010      |   1 -
>  tests/qemu-iotests/011      |   1 -
>  tests/qemu-iotests/012      |   1 -
>  tests/qemu-iotests/013      |   1 -
>  tests/qemu-iotests/014      |   1 -
>  tests/qemu-iotests/015      |   1 -
>  tests/qemu-iotests/017      |   1 -
>  tests/qemu-iotests/020      |   1 -
>  tests/qemu-iotests/021      |   1 -
>  tests/qemu-iotests/022      |   1 -
>  tests/qemu-iotests/023      |   1 -
>  tests/qemu-iotests/025      |   1 -
>  tests/qemu-iotests/026      |   1 -
>  tests/qemu-iotests/027      |   1 -
>  tests/qemu-iotests/028      |   1 -
>  tests/qemu-iotests/029      |   1 -
>  tests/qemu-iotests/031      |   1 -
>  tests/qemu-iotests/032      |   1 -
>  tests/qemu-iotests/033      |   1 -
>  tests/qemu-iotests/035      |   1 -
>  tests/qemu-iotests/036      |   1 -
>  tests/qemu-iotests/037      |   1 -
>  tests/qemu-iotests/042      |   1 -
>  tests/qemu-iotests/043      |   1 -
>  tests/qemu-iotests/046      |   1 -
>  tests/qemu-iotests/047      |   1 -
>  tests/qemu-iotests/049      |   1 -
>  tests/qemu-iotests/050      |   1 -
>  tests/qemu-iotests/051      |   1 -
>  tests/qemu-iotests/052      |   1 -
>  tests/qemu-iotests/053      |   1 -
>  tests/qemu-iotests/054      |   1 -
>  tests/qemu-iotests/060      |   1 -
>  tests/qemu-iotests/061      |   1 -
>  tests/qemu-iotests/062      |   1 -
>  tests/qemu-iotests/063      |   1 -
>  tests/qemu-iotests/066      |   1 -
>  tests/qemu-iotests/067      |   1 -
>  tests/qemu-iotests/068      |   1 -
>  tests/qemu-iotests/069      |   1 -
>  tests/qemu-iotests/071      |   1 -
>  tests/qemu-iotests/072      |   1 -
>  tests/qemu-iotests/073      |   1 -
>  tests/qemu-iotests/079      |   1 -
>  tests/qemu-iotests/080      |   1 -
>  tests/qemu-iotests/082      |   1 -
>  tests/qemu-iotests/085      |   1 -
>  tests/qemu-iotests/089      |   1 -
>  tests/qemu-iotests/090      |   1 -
>  tests/qemu-iotests/091      |   1 -
>  tests/qemu-iotests/094      |   1 -
>  tests/qemu-iotests/095      |   1 -
>  tests/qemu-iotests/097      |   1 -
>  tests/qemu-iotests/098      |   1 -
>  tests/qemu-iotests/102      |   1 -
>  tests/qemu-iotests/103      |   1 -
>  tests/qemu-iotests/104      |   1 -
>  tests/qemu-iotests/105      |   1 -
>  tests/qemu-iotests/107      |   1 -
>  tests/qemu-iotests/110      |   1 -
>  tests/qemu-iotests/111      |   1 -
>  tests/qemu-iotests/112      |   1 -
>  tests/qemu-iotests/114      |   1 -
>  tests/qemu-iotests/115      |   1 -
>  tests/qemu-iotests/117      |   1 -
>  tests/qemu-iotests/120      |   1 -
>  tests/qemu-iotests/121      |   1 -
>  tests/qemu-iotests/122      |   1 -
>  tests/qemu-iotests/125      |   1 -
>  tests/qemu-iotests/126      |   1 -
>  tests/qemu-iotests/127      |   1 -
>  tests/qemu-iotests/130      |   1 -
>  tests/qemu-iotests/133      |   1 -
>  tests/qemu-iotests/134      |   1 -
>  tests/qemu-iotests/137      |   1 -
>  tests/qemu-iotests/138      |   1 -
>  tests/qemu-iotests/141      |   1 -
>  tests/qemu-iotests/142      |   1 -
>  tests/qemu-iotests/143      |   1 -
>  tests/qemu-iotests/144      |   1 -
>  tests/qemu-iotests/145      |   1 -
>  tests/qemu-iotests/153      |   1 -
>  tests/qemu-iotests/156      |   1 -
>  tests/qemu-iotests/157      |   1 -
>  tests/qemu-iotests/158      |   1 -
>  tests/qemu-iotests/159      |   1 -
>  tests/qemu-iotests/161      |   1 -
>  tests/qemu-iotests/162      |   1 -
>  tests/qemu-iotests/170      |   1 -
>  tests/qemu-iotests/172      |   1 -
>  tests/qemu-iotests/173      |   1 -
>  tests/qemu-iotests/176      |   1 -
>  tests/qemu-iotests/178      |   1 -
>  tests/qemu-iotests/181      |   1 -
>  tests/qemu-iotests/182      |   1 -
>  tests/qemu-iotests/183      |   1 -
>  tests/qemu-iotests/185      |   1 -
>  tests/qemu-iotests/186      |   1 -
>  tests/qemu-iotests/187      |   1 -
>  tests/qemu-iotests/189      |   1 -
>  tests/qemu-iotests/190      |   1 -
>  tests/qemu-iotests/191      |   1 -
>  tests/qemu-iotests/192      |   1 -
>  tests/qemu-iotests/195      |   1 -
>  tests/qemu-iotests/197      |   1 -
>  tests/qemu-iotests/198      |   1 -
>  tests/qemu-iotests/200      |   1 -
>  tests/qemu-iotests/201      |   1 -
>  tests/qemu-iotests/214      |   1 -
>  tests/qemu-iotests/215      |   1 -
>  tests/qemu-iotests/217      |   1 -
>  tests/qemu-iotests/220      |   1 -
>  tests/qemu-iotests/227      |   1 -
>  tests/qemu-iotests/229      |   1 -
>  tests/qemu-iotests/231      |   1 -
>  tests/qemu-iotests/232      |   1 -
>  tests/qemu-iotests/233      |   1 -
>  tests/qemu-iotests/239      |   2 +-
>  tests/qemu-iotests/240      |   3 +-
>  tests/qemu-iotests/241      |   2 +-
>  tests/qemu-iotests/243      |   2 +-
>  tests/qemu-iotests/244      |   2 +-
>  tests/qemu-iotests/247      |   1 -
>  tests/qemu-iotests/check    |  13 ++-
>  tests/qemu-iotests/group    | 194 +++++++++++++++++++-----------------
>  137 files changed, 139 insertions(+), 229 deletions(-)
>