From 6aa65dff38002594f629705f2a0441ba5c6b1ae0 Mon Sep 17 00:00:00 2001 From: imxcc Date: Fri, 14 Jan 2022 12:53:11 +0800 Subject: [PATCH] tests: disabale storage tests The storagetest in obs cannot be, and related tests are temporarily disabled Signed-off-by: imxcc --- libvirt.spec | 9 ++++-- tests-disabale-storage-tests.patch | 45 ++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 tests-disabale-storage-tests.patch diff --git a/libvirt.spec b/libvirt.spec index ff9d866..688155c 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -34,7 +34,7 @@ # Then the secondary host drivers, which run inside libvirtd %define with_storage_rbd 0%{!?_without_storage_rbd:1} %define with_storage_sheepdog 0%{!?_without_storage_sheepdog:0} -%define with_storage_gluster 0%{!?_without_storage_gluster:0} +%define with_storage_gluster 0%{!?_without_storage_gluster:1} %define with_numactl 0%{!?_without_numactl:1} @@ -105,7 +105,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 6.2.0 -Release: 28 +Release: 29 License: LGPLv2+ URL: https://libvirt.org/ @@ -198,6 +198,7 @@ Patch0081: hotpatch-check-vm-id-and-pid-before-using-hotpatch-a.patch Patch0082: domain-add-logs-for-virDomainHotpatchManage.patch Patch0083: docs-build-Don-t-include-stylesheet-in-intermediate-.patch Patch0084: tests-Replace-deprecated-ASN1-code.patch +Patch0085: tests-disabale-storage-tests.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -302,6 +303,7 @@ BuildRequires: librados-devel BuildRequires: librbd-devel %endif %if %{with_storage_gluster} +BuildRequires: libgfapi0 BuildRequires: glusterfs-api-devel >= 3.4.1 BuildRequires: glusterfs-devel >= 3.4.1 %endif @@ -1931,6 +1933,9 @@ exit 0 %changelog +* Fri Jun 14 2022 imxcc +- tests: disabale storage tests + * Tue Jun 11 2022 imxcc - docs: build: Don't include stylesheet in intermediate html - tests: Replace deprecated ASN1 code diff --git a/tests-disabale-storage-tests.patch b/tests-disabale-storage-tests.patch new file mode 100644 index 0000000..09afb47 --- /dev/null +++ b/tests-disabale-storage-tests.patch @@ -0,0 +1,45 @@ +From c4001b2b3f3a078db03ffdc0812e72881972b300 Mon Sep 17 00:00:00 2001 +From: imxcc +Date: Fri, 14 Jan 2022 11:46:27 +0800 +Subject: [PATCH] tests: disabale storage tests + +The storagetest in obs cannot be, and related tests are temporarily +disabled + +Signed-off-by: imxcc +--- + tests/Makefile.am | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index ada5b8f..abb261e 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -363,16 +363,10 @@ endif WITH_NWFILTER + + if WITH_STORAGE + test_programs += storagevolxml2argvtest +-test_programs += storagepoolxml2argvtest + test_programs += virstorageutiltest +-test_programs += storagepoolxml2xmltest + test_programs += storagepoolcapstest + endif WITH_STORAGE + +-if WITH_STORAGE_FS +-test_programs += virstoragetest +-endif WITH_STORAGE_FS +- + if WITH_LINUX + test_programs += virscsitest + endif WITH_LINUX +@@ -430,7 +424,6 @@ test_scripts += $(libvirtd_test_scripts) + + test_programs += \ + eventtest \ +- virdrivermoduletest \ + virdriverconnvalidatetest + else ! WITH_LIBVIRTD + EXTRA_DIST += $(libvirtd_test_scripts) +-- +2.27.0 + -- Gitee