!86 limit number of test threads to reduce test execution time
Merge pull request !86 from jinag12/master
This commit is contained in:
commit
9cbf7c0d35
12
bind.spec
12
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: 5
|
||||
Release: 6
|
||||
Epoch: 32
|
||||
Url: https://www.isc.org/downloads/bind/
|
||||
#
|
||||
@ -79,6 +79,8 @@ Patch157:bind-9.11-fips-tests.patch
|
||||
# https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/2689
|
||||
Patch164:bind-9.11-rh1666814.patch
|
||||
|
||||
Patch9000:bugfix-limit-numbers-of-test-threads.patch
|
||||
|
||||
%{?systemd_ordering}
|
||||
Requires: coreutils
|
||||
Requires: shadow-utils
|
||||
@ -371,6 +373,8 @@ in HTML and PDF format.
|
||||
%patch157 -p1 -b .fips-tests
|
||||
%patch164 -p1 -b .rh1666814
|
||||
|
||||
%patch9000 -p1
|
||||
|
||||
%if %{with PKCS11}
|
||||
%patch135 -p1 -b .config-pkcs11
|
||||
cp -r bin/named{,-pkcs11}
|
||||
@ -1092,6 +1096,12 @@ fi;
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Feb 09 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-6
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:limit number of test threads to reduce test execution time
|
||||
|
||||
* Tue Jan 18 2022 jiangheng<jiangheng12@huawei.com> - 9.16.23-5
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
39
bugfix-limit-numbers-of-test-threads.patch
Normal file
39
bugfix-limit-numbers-of-test-threads.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From 1d9843b58800b51e1366fba5e0bdef5f0336efaf Mon Sep 17 00:00:00 2001
|
||||
From: jiangheng <jiangheng12@huawei.com>
|
||||
Date: Wed, 9 Feb 2022 16:21:10 +0800
|
||||
Subject: [PATCH] limit numbers of test threads to reduce execution time
|
||||
|
||||
---
|
||||
lib/dns/tests/dnstest.c | 2 +-
|
||||
lib/ns/tests/nstest.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
|
||||
index 465ce9f..263b0d6 100644
|
||||
--- a/lib/dns/tests/dnstest.c
|
||||
+++ b/lib/dns/tests/dnstest.c
|
||||
@@ -114,7 +114,7 @@ cleanup_managers(void) {
|
||||
static isc_result_t
|
||||
create_managers(void) {
|
||||
isc_result_t result;
|
||||
- ncpus = isc_os_ncpus();
|
||||
+ ncpus = ISC_MIN(isc_os_ncpus(), 8);
|
||||
|
||||
CHECK(isc_managers_create(dt_mctx, ncpus, 0, &netmgr, &taskmgr));
|
||||
CHECK(isc_timermgr_create(dt_mctx, &timermgr));
|
||||
diff --git a/lib/ns/tests/nstest.c b/lib/ns/tests/nstest.c
|
||||
index 238450d..b5fa00c 100644
|
||||
--- a/lib/ns/tests/nstest.c
|
||||
+++ b/lib/ns/tests/nstest.c
|
||||
@@ -243,7 +243,7 @@ create_managers(void) {
|
||||
in_port_t port = 5300 + isc_random8();
|
||||
ns_listenlist_t *listenon = NULL;
|
||||
isc_event_t *event = NULL;
|
||||
- ncpus = isc_os_ncpus();
|
||||
+ ncpus = ISC_MIN(isc_os_ncpus(), 8);
|
||||
|
||||
CHECK(isc_managers_create(mctx, ncpus, 0, &netmgr, &taskmgr));
|
||||
CHECK(isc_task_create_bound(taskmgr, 0, &maintask, 0));
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user