From 925a9bee8a02e75287634a4290a1fc45bf18669a Mon Sep 17 00:00:00 2001 From: lihaoxiang Date: Fri, 6 Jan 2023 09:04:12 +0000 Subject: [PATCH] remove patch 'skip testcase 23' Signed-off-by: lihaoxiang (cherry picked from commit 641e9a0613b3463a90c3e15c92c6c5495afe9a4e) --- ...=> 0006-libaio-Add-sw64-architecture.patch | 0 ...-since-current-kernel-version-not-su.patch | 29 ------------------- libaio.spec | 11 +++---- 3 files changed, 6 insertions(+), 34 deletions(-) rename 0007-libaio-Add-sw64-architecture.patch => 0006-libaio-Add-sw64-architecture.patch (100%) delete mode 100644 0006-skip-testcase-23-since-current-kernel-version-not-su.patch diff --git a/0007-libaio-Add-sw64-architecture.patch b/0006-libaio-Add-sw64-architecture.patch similarity index 100% rename from 0007-libaio-Add-sw64-architecture.patch rename to 0006-libaio-Add-sw64-architecture.patch diff --git a/0006-skip-testcase-23-since-current-kernel-version-not-su.patch b/0006-skip-testcase-23-since-current-kernel-version-not-su.patch deleted file mode 100644 index 8fa5413..0000000 --- a/0006-skip-testcase-23-since-current-kernel-version-not-su.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 385c1b9eb28e1cc1f64ddedb4a64aa2effa13d5c Mon Sep 17 00:00:00 2001 -From: wangzhiqiang -Date: Thu, 3 Nov 2022 16:24:49 +0800 -Subject: [PATCH] skip testcase 23 since current kernel version not support - -current kernel version of obs not support run testcase 23, -so skip it to avoild build error. -issue: https://gitee.com/src-openeuler/libaio/issue/I5XELL ---- - harness/runtests.sh | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/harness/runtests.sh b/harness/runtests.sh -index e9ceec8..a62bae7 100755 ---- a/harness/runtests.sh -+++ b/harness/runtests.sh -@@ -9,6 +9,9 @@ echo "Test run starting at" `date` - while [ $# -ge 1 ] ; do - this_test=$1 - shift -+ if [ $this_test = "cases/23.p" ];then -+ continue -+ fi - echo "Starting $this_test" - $this_test 2>&1 - res=$? --- -2.33.0 - diff --git a/libaio.spec b/libaio.spec index 7e047ed..d2b151e 100644 --- a/libaio.spec +++ b/libaio.spec @@ -1,7 +1,7 @@ Name: libaio Version: 0.3.113 -Release: 5 +Release: 6 Summary: Linux-native asynchronous I/O access library License: LGPLv2+ URL: https://pagure.io/libaio @@ -15,8 +15,7 @@ Patch2: 0002-libaio-makefile-cflags.patch Patch3: 0003-libaio-fix-for-x32.patch Patch4: 0004-libaio-makefile-add-D_FORTIFY_SOURCE-flag.patch Patch5: 0005-Fix-compile-error-that-exec-checking-need-super-priv.patch -Patch6: 0006-skip-testcase-23-since-current-kernel-version-not-su.patch -Patch7: 0007-libaio-Add-sw64-architecture.patch +Patch6: 0006-libaio-Add-sw64-architecture.patch BuildRequires: gcc @@ -45,9 +44,8 @@ Files for libaio development %patch3 -p1 -b .fix-x32 %patch4 -p1 -b .makefile-add-D_FORTIFY_SOURCE-flag %patch5 -p1 -b .fix-compile-error -%patch6 -p1 -b .skip-testcase %ifarch sw_64 -%patch7 -p1 +%patch6 -p1 %endif %build @@ -73,6 +71,9 @@ make check %attr(0755,root,root) %{_libdir}/libaio.so %changelog +* Wed Jan 11 2023 lihaoxiang - 0.3.113-6 +- remove patch 'skip testcase 23' + * Thu Dec 8 2022 Chenxi Mao - 0.3.113-5 - Remove useless shared library -- Gitee