From e7bd0fac1e12a5e76423dcc875fd2dc4d8f0858f Mon Sep 17 00:00:00 2001
From: jiangheng <jiangheng12@huawei.com>
Date: Fri, 14 Jan 2022 11:04:30 +0800
Subject: [PATCH] fix some test cases execute time too long

---
 bind.spec                                     | 15 ++++++---
 ...meout-interval-of-some-cases-to-600s.patch | 32 -------------------
 2 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 set-timeout-interval-of-some-cases-to-600s.patch

diff --git a/bind.spec b/bind.spec
index aba613a..861ec3e 100644
--- a/bind.spec
+++ b/bind.spec
@@ -30,7 +30,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  MPLv2.0
 Version:  9.16.23
-Release:  2
+Release:  3
 Epoch:    32
 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
 Patch164:bind-9.11-rh1666814.patch
 
-Patch9000:set-timeout-interval-of-some-cases-to-600s.patch
-
 %{?systemd_ordering}
 Requires:       coreutils
 Requires:       shadow-utils
@@ -371,7 +369,6 @@ in HTML and PDF format.
 %patch130 -p1 -b .libdb
 %patch157 -p1 -b .fips-tests
 %patch164 -p1 -b .rh1666814
-%patch9000 -p1
 
 %if %{with 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)
     ulimit -n 4096 || : # Requires on some machines with many cores
   fi
+  export ISC_TASK_WORKERS=8
   make unit
   e=$?
   if [ "$e" -ne 0 ]; then
@@ -1094,7 +1092,14 @@ fi;
 %endif
 
 %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
 - CVE:NA
 - SUG:NA
diff --git a/set-timeout-interval-of-some-cases-to-600s.patch b/set-timeout-interval-of-some-cases-to-600s.patch
deleted file mode 100644
index fb09f21..0000000
--- a/set-timeout-interval-of-some-cases-to-600s.patch
+++ /dev/null
@@ -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
-
-- 
Gitee