From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: 02/05: gnu: nss, nss-certs: Update to 3.29.3. Date: Wed, 15 Mar 2017 14:12:43 +0100 Message-ID: <87vara3cqc.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20170313174039.25881.89989@vcs0.savannah.gnu.org> <20170313174040.C5C6B20CAB@vcs0.savannah.gnu.org> <878to8qssk.fsf@netris.org> <87innc43ub.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <871stzh8rv.fsf@netris.org> <20170314212701.GA8440@jasmine> <874lyv4jx7.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170314215913.GA13036@jasmine> <87y3w733ue.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1co8jW-0006Ny-EA for guix-devel@gnu.org; Wed, 15 Mar 2017 09:12:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1co8jR-0001NX-Ff for guix-devel@gnu.org; Wed, 15 Mar 2017 09:12:54 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:46409) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1co8jR-0001NP-7r for guix-devel@gnu.org; Wed, 15 Mar 2017 09:12:49 -0400 In-Reply-To: <87y3w733ue.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari Cc: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Marius Bakke writes: > Patch attached. I *think* the two values are for client and server > respectively, but will study the source and build logs some more to make > sure we're adjusting the right knobs. > > I suggest we try this on 'core-updates' if the patch is correct. The patch builds fine on x86_64, and I've verified that these are the correct settings by decreasing the values instead of increasing. What do you think? Should we check if 25s is high enough on 'core-updates' or push it directly to 'master'? --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-nss-Increase-test-timeouts.patch Content-Transfer-Encoding: quoted-printable From=2033bbf7bc60b222adc6effc7257440fd8222ef04b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Mar 2017 22:54:41 +0100 Subject: [PATCH] gnu: nss: Increase test timeouts. * gnu/packages/patches/nss-increase-test-timeout.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnuzilla.scm (nss)[source]: Use it. =2D-- gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 3 ++- .../patches/nss-increase-test-timeout.patch | 25 ++++++++++++++++++= ++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/nss-increase-test-timeout.patch diff --git a/gnu/local.mk b/gnu/local.mk index c1b076a5f..7fb22ebb5 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -780,6 +780,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/ninja-tests.patch \ %D%/packages/patches/ninja-zero-mtime.patch \ %D%/packages/patches/node-9077.patch \ + %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ %D%/packages/patches/ntfs-3g-CVE-2017-0358.patch \ %D%/packages/patches/nvi-assume-preserve-path.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e6e24f665..1d84e7a9a 100644 =2D-- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -199,7 +199,8 @@ in the Mozilla clients.") (base32 "149807rmzb76hnh48rw4m9jw83iw0168njzchz0hmbsgc8mk0i5w")) ;; Create nss.pc and nss-config. =2D (patches (search-patches "nss-pkgconfig.patch")))) + (patches (search-patches "nss-pkgconfig.patch" + "nss-increase-test-timeout.patch"))= )) (build-system gnu-build-system) (outputs '("out" "bin")) (arguments diff --git a/gnu/packages/patches/nss-increase-test-timeout.patch b/gnu/pac= kages/patches/nss-increase-test-timeout.patch new file mode 100644 index 000000000..c6aac6ac0 =2D-- /dev/null +++ b/gnu/packages/patches/nss-increase-test-timeout.patch @@ -0,0 +1,25 @@ +We've seen some tests take more than 20s to complete on a busy armhf +machine. Even a busy x86_64 machine can use more than 5s on some tests. + +Increase timeouts to increase chances of a successful build. + +--- a/nss/gtests/ssl_gtest/tls_connect.cc 2017-03-14 22:47:30.855813629 +0= 100 ++++ b/nss/gtests/ssl_gtest/tls_connect.cc 2017-03-14 22:48:49.042335273 +0= 100 +@@ -245,7 +245,7 @@ +=20 + ASSERT_TRUE_WAIT((client_->state() !=3D TlsAgent::STATE_CONNECTING) && + (server_->state() !=3D TlsAgent::STATE_CONNECTING), +- 5000); ++ 25000); + } +=20 + void TlsConnectTestBase::EnableExtendedMasterSecret() { +@@ -387,7 +387,7 @@ + } else { + fail_agent =3D server_; + } +- ASSERT_TRUE_WAIT(fail_agent->state() =3D=3D TlsAgent::STATE_ERROR, 5000= ); ++ ASSERT_TRUE_WAIT(fail_agent->state() =3D=3D TlsAgent::STATE_ERROR, 2500= 0); + } +=20 + void TlsConnectTestBase::ConfigureVersion(uint16_t version) { =2D-=20 2.12.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljJPcsACgkQoqBt8qM6 VPoHHwf+MtCG7wIVPkRDJM6nEunhKpskFLkDqBqwCa47aoy6yy9rBwsfCUUHZbHu kycRLqUyVec9w44ietCKeVmmxog/uGVaC+9nMZY4+N9oFXqwz2+MGzIvSdOvv7cr P/YwdB6aS6osIFl0Jz3vx9AvGM8YjF/WBxH7LJsyIy+yyehAKCRX9kZTNhR8v7NY iIJJWHR4zfpIyL5WBc8FD3K25DeztH8syuFIQlvLaqQ1D6hOTWka8HX9XEYso4bn kbl7JJYaYle+/qqjMpzFoIcNjGRZzX0JpC4wpbBC/Xn3wMwMMzFmGJNmzQpXUkba opSkX6O06xdwrPiru52a7CtWkEOpLA== =Zdxw -----END PGP SIGNATURE----- --==-=-=--