Revert "tests: disabale storage tests"
glusterfs bug about "tcmalloc" has fixed, details in https://gitee.com/src-openeuler/gluterfs/pulls/26 Signed-off-by: imxcc <xingchaochao@huawei.com>
This commit is contained in:
parent
ca082a53da
commit
8125920b1b
42
Revert-tests-disabale-storage-tests.patch
Normal file
42
Revert-tests-disabale-storage-tests.patch
Normal file
@ -0,0 +1,42 @@
|
||||
From 8629a253113a019215b38f7206db03892157a370 Mon Sep 17 00:00:00 2001
|
||||
From: imxcc <xingchaochao@huawei.com>
|
||||
Date: Sat, 29 Jan 2022 17:14:59 +0800
|
||||
Subject: [PATCH] Revert tests: disabale storage tests
|
||||
|
||||
Signed-off-by: imxcc <xingchaochao@huawei.com>
|
||||
---
|
||||
tests/Makefile.am | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index abb261e..ada5b8f 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -363,10 +363,16 @@ 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
|
||||
@@ -424,6 +430,7 @@ test_scripts += $(libvirtd_test_scripts)
|
||||
|
||||
test_programs += \
|
||||
eventtest \
|
||||
+ virdrivermoduletest \
|
||||
virdriverconnvalidatetest
|
||||
else ! WITH_LIBVIRTD
|
||||
EXTRA_DIST += $(libvirtd_test_scripts)
|
||||
--
|
||||
2.27.0
|
||||
|
||||
14
libvirt.spec
14
libvirt.spec
@ -48,11 +48,7 @@
|
||||
%define with_storage_zfs 0
|
||||
%endif
|
||||
|
||||
%ifarch aarch64
|
||||
%define arg_dtrace --without-dtrace
|
||||
%else
|
||||
%define arg_dtrace --with-dtrace
|
||||
%endif
|
||||
|
||||
# We need a recent enough libiscsi (>= 1.18.0)
|
||||
%define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
|
||||
@ -105,7 +101,7 @@
|
||||
Summary: Library providing a simple virtualization API
|
||||
Name: libvirt
|
||||
Version: 6.2.0
|
||||
Release: 29
|
||||
Release: 30
|
||||
License: LGPLv2+
|
||||
URL: https://libvirt.org/
|
||||
|
||||
@ -199,6 +195,7 @@ 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
|
||||
Patch0086: Revert-tests-disabale-storage-tests.patch
|
||||
|
||||
Requires: libvirt-daemon = %{version}-%{release}
|
||||
Requires: libvirt-daemon-config-network = %{version}-%{release}
|
||||
@ -1245,7 +1242,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
|
||||
# Copied into libvirt-docs subpackage eventually
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs
|
||||
|
||||
%ifarch %{power64} s390x x86_64 ia64 alpha sparc64
|
||||
%ifarch %{power64} s390x ia64 alpha sparc64
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \
|
||||
$RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp
|
||||
|
||||
@ -1811,7 +1808,7 @@ exit 0
|
||||
%{_bindir}/virt-pki-validate
|
||||
%{_bindir}/virt-host-validate
|
||||
|
||||
%ifnarch aarch64
|
||||
%ifnarch aarch64 x86_64
|
||||
%{_datadir}/systemtap/tapset/libvirt_probes*.stp
|
||||
%{_datadir}/systemtap/tapset/libvirt_functions.stp
|
||||
%if %{with_qemu}
|
||||
@ -1933,6 +1930,9 @@ exit 0
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jun 29 2022 imxcc <xingchaochao@huawei.com>
|
||||
- Revert "tests: disabale storage tests"
|
||||
|
||||
* Fri Jun 14 2022 imxcc <xingchaochao@huawei.com>
|
||||
- tests: disabale storage tests
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user