packages/bind
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some test cases execute time too long

Browse Source
This commit is contained in:
jiangheng 2022-01-14 11:04:30 +08:00
parent 0f9967f225
commit e7bd0fac1e
2 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bind.spec
View File

@ -30,7 +30,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind Name: bind
License: MPLv2.0 License: MPLv2.0
Version: 9.16.23 Version: 9.16.23
Release: 2 Release: 3
Epoch: 32 Epoch: 32
Url: https://www.isc.org/downloads/bind/ Url: https://www.isc.org/downloads/bind/
# #
@ -79,8 +79,6 @@ Patch157:bind-9.11-fips-tests.patch
# https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/2689 # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/2689
Patch164:bind-9.11-rh1666814.patch Patch164:bind-9.11-rh1666814.patch
Patch9000:set-timeout-interval-of-some-cases-to-600s.patch
%{?systemd_ordering} %{?systemd_ordering}
Requires: coreutils Requires: coreutils
Requires: shadow-utils Requires: shadow-utils
@ -371,7 +369,6 @@ in HTML and PDF format.
%patch130 -p1 -b .libdb %patch130 -p1 -b .libdb
%patch157 -p1 -b .fips-tests %patch157 -p1 -b .fips-tests
%patch164 -p1 -b .rh1666814 %patch164 -p1 -b .rh1666814
%patch9000 -p1
%if %{with PKCS11} %if %{with PKCS11}
%patch135 -p1 -b .config-pkcs11 %patch135 -p1 -b .config-pkcs11
@ -538,6 +535,7 @@ export TSAN_OPTIONS="log_exe_name=true log_path=ThreadSanitizer exitcode=0"
ORIGFILES=$(ulimit -n) ORIGFILES=$(ulimit -n)
ulimit -n 4096 || : # Requires on some machines with many cores ulimit -n 4096 || : # Requires on some machines with many cores
fi fi
export ISC_TASK_WORKERS=8
make unit make unit
e=$? e=$?
if [ "$e" -ne 0 ]; then if [ "$e" -ne 0 ]; then
@ -1094,7 +1092,14 @@ fi;
%endif %endif
%changelog %changelog
* Mon Jan 10 2021 jiangheng<jiangheng12@huawei.com> - 9.16.23-2 * Fri Jan 14 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-3
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:remove set-timeout-inteval-of-some-cases-to-600s.patch
specify ISC_TASK_WORKERS value to fix some test cases execute time too long
* Mon Jan 10 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-2
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA
- SUG:NA - SUG:NA

32
set-timeout-interval-of-some-cases-to-600s.patch
View File

@ -1,32 +0,0 @@
From e2f4ca18b48328f584ef612a535bdf1f51353b46 Mon Sep 17 00:00:00 2001
From: jiangheng <jiangheng12@huawei.com>
Date: Tue, 11 Jan 2022 11:28:11 +0800
Subject: [PATCH] set timeout interval of some cases to 600s
---
lib/isc/tests/Kyuafile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/isc/tests/Kyuafile b/lib/isc/tests/Kyuafile
index 8e9d8db..5b9d389 100644
--- a/lib/isc/tests/Kyuafile
+++ b/lib/isc/tests/Kyuafile
@@ -9,12 +9,12 @@ tap_test_program{name='file_test'}
tap_test_program{name='hash_test'}
tap_test_program{name='heap_test'}
tap_test_program{name='hmac_test'}
-tap_test_program{name='ht_test'}
+tap_test_program{name='ht_test', timeout=600}
tap_test_program{name='lex_test'}
tap_test_program{name='md_test'}
-tap_test_program{name='mem_test'}
+tap_test_program{name='mem_test', timeout=600}
tap_test_program{name='netaddr_test'}
-tap_test_program{name='netmgr_test'}
+tap_test_program{name='netmgr_test', timeout=600}
tap_test_program{name='parse_test'}
tap_test_program{name='pool_test'}
tap_test_program{name='radix_test'}
--
1.8.3.1