#54 Rebase to qemu 8.1.3
Merged 3 months ago by crobinso. Opened 3 months ago by crobinso.
rpms/ crobinso/qemu f39-stable-8.1.3  into  f39

@@ -1,58 +0,0 @@ 

- From e4a112c75a02a789e7710e805f66211426087d55 Mon Sep 17 00:00:00 2001

- Message-ID: <e4a112c75a02a789e7710e805f66211426087d55.1692544104.git.crobinso@redhat.com>

- From: Cole Robinson <crobinso@redhat.com>

- Date: Sun, 20 Aug 2023 10:49:12 -0400

- Subject: [PATCH] tests: Disable iotests, like RHEL does

- Content-type: text/plain

- 

- Signed-off-by: Cole Robinson <crobinso@redhat.com>

- ---

-  tests/qemu-iotests/meson.build | 34 +++++++++++++++++-----------------

-  1 file changed, 17 insertions(+), 17 deletions(-)

- 

- diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build

- index 44761e1e4d..78c5836325 100644

- --- a/tests/qemu-iotests/meson.build

- +++ b/tests/qemu-iotests/meson.build

- @@ -51,21 +51,21 @@ foreach format, speed: qemu_iotests_formats

-        check: true,

-    )

-  

- -  foreach item: rc.stdout().strip().split()

- -      args = [qemu_iotests_check_cmd,

- -              '-tap', '-' + format, item,

- -              '--source-dir', meson.current_source_dir(),

- -              '--build-dir', meson.current_build_dir()]

- -      # Some individual tests take as long as 45 seconds

- -      # Bump the timeout to 3 minutes for some headroom

- -      # on slow machines to minimize spurious failures

- -      test('io-' + format + '-' + item,

- -           python,

- -           args: args,

- -           depends: qemu_iotests_binaries,

- -           env: qemu_iotests_env,

- -           protocol: 'tap',

- -           timeout: 180,

- -           suite: suites)

- -  endforeach

- +#   foreach item: rc.stdout().strip().split()

- +#       args = [qemu_iotests_check_cmd,

- +#               '-tap', '-' + format, item,

- +#               '--source-dir', meson.current_source_dir(),

- +#               '--build-dir', meson.current_build_dir()]

- +#       # Some individual tests take as long as 45 seconds

- +#       # Bump the timeout to 3 minutes for some headroom

- +#       # on slow machines to minimize spurious failures

- +#       test('io-' + format + '-' + item,

- +#            python,

- +#            args: args,

- +#            depends: qemu_iotests_binaries,

- +#            env: qemu_iotests_env,

- +#            protocol: 'tap',

- +#            timeout: 180,

- +#            suite: suites)

- +#   endforeach

-  endforeach

- -- 

- 2.41.0

- 

file modified
+8 -3
@@ -341,7 +341,7 @@ 

  

  Summary: QEMU is a FAST! processor emulator

  Name: qemu

- Version: 8.1.1

+ Version: 8.1.3

  Release: %{baserelease}%{?rcrel}%{?dist}

  Epoch: 2

  License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-3.0
@@ -360,8 +360,6 @@ 

  Source31: kvm-x86.conf

  Source36: README.tests

  

- Patch0001: 0001-tests-Disable-iotests-like-RHEL-does.patch

- 

  BuildRequires: meson >= %{meson_version}

  BuildRequires: bison

  BuildRequires: flex
@@ -2025,6 +2023,10 @@ 

  

  

  %check

+ # Disable iotests. RHEL has done this forever, and these

+ # tests have been flakey in the past

+ export MTESTARGS="--no-suite block"

+ 

  %if %{with check}

  %if !%{tools_only}

  
@@ -2807,6 +2809,9 @@ 

  

  

  %changelog

+ * Tue Nov 28 2023 Cole Robinson <crobinso@redhat.com> - 8.1.3-1

+ - Rebase to qemu 8.1.3

+ 

  * Tue Sep 26 2023 Cole Robinson <crobinso@redhat.com> - 8.1.1-1

  - Rebase to qemu 8.1.1

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (qemu-8.1.1.tar.xz) = 199db58f9a413cbe4449ff557bc362e666c6c0291f9963cb74e5542e8abd1edcd65001fa1fd453b850a376de455f93258707ce6feee5a44bf40753b12a2e956c

+ SHA512 (qemu-8.1.3.tar.xz) = d3847f1c0c0099937d08bba604713ac288b6151867a8da230297ee1d93b7e741fa406a2f7bf6645ce3293c0a98458dc9c79454746e7c2920e9a73e0574753e5a

  • Rebase to 8.1.3
  • Drop the iotests disabling patch, use MTESTARGS from spec file instead

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/751f0407491c4d98b3fee9e8805a0212

Pull-Request has been merged by crobinso

3 months ago