From nobody Fri Jan 21 00:55:25 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E5097196A177; Fri, 21 Jan 2022 00:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jg1Bj64Zzz3jKX; Fri, 21 Jan 2022 00:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642726525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U7tVTSIEurSCjTxAhZe1W+NGhG6lRC0OFAkmqtBFXnM=; b=fU7TBlXtzSGlaq2DNJvEn0t/iDfZGdLng5XOpa0Cmf7tLRhyfBmYuvmwqph2PTC9l0CHgi B0e3pc5JhAINjiCX2TyJDloLZ8b8C3yKsVRjR15ae51ldBaUBjAuHaqJEwttuc7L7aTuEG bkYVCwCXvpgDOvoUJ90QqaMu/FLMHc+/HUDzjaJYVEsek096+1prWOG+GytmZUvAcuY8mH VojpYSz14tycmEBmjgoDUYSqMCOmX27/k/Iidgb3yf0FkyekosmPhjM5FNVjyYz5r9qDwo Qvh/8x/2BgwRcwqj9Y3vuTIIG1QE5y4DVo7pXFGj8VyFV3O1LcyHwSjoh7KUBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B1BD712A8F; Fri, 21 Jan 2022 00:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20L0tPeu080461; Fri, 21 Jan 2022 00:55:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20L0tPAq080460; Fri, 21 Jan 2022 00:55:25 GMT (envelope-from git) Date: Fri, 21 Jan 2022 00:55:25 GMT Message-Id: <202201210055.20L0tPAq080460@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9f192dd79cce - stable/12 - netbsd-tests: Fix the libc stat_socket test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 9f192dd79cce2ea53a1cdc3ab64ea204a2fb9d84 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642726525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U7tVTSIEurSCjTxAhZe1W+NGhG6lRC0OFAkmqtBFXnM=; b=CvlXBbsJd94vA0rOwMaECvjJC/418qTmqsWJNdDq7GctLOLSM+/KbszR4p268yA9b+tGOc drDis2oqzA/jwnrw4X5TbEBXfNwgBlpnhDGf+nBCv5RrNc1mMeTO4w3fvub+bTwWf06qDE d6HwmmOReH7d0I35YJ/V5X3XgDK0R+EdFuQogkPESjvIfqgs7gN/bM6tLT3B80i+rwiEBt BO5TskwpzR70/QQibVhv+93mTuUXXClQ+EYvsqpEIjcPcYy74nV1KRXCvrlsdOMQ2ooSHT hAfpXAh32knAcD33G9wJj7ZJBUE3WLT19Qv+JqnkuzPtc/02oqDKhJaqgOMncA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642726525; a=rsa-sha256; cv=none; b=gkjnhuggUdW/CNYL8Rvk5uVJRhJgGO4OhyZ4LBpHBGhffD4tsYIsdmYhfhqWILuvT6rE/+ R1JIpLebQUMhf1ygI3umAQY1VAPujVz6KVYOdNDKn2S4zwt0VTjtznxRgNE2pAmR+mZY2X /rJ+SgQhsBz/BdrC39R3dxLxUcF6Ne777nqkcP6PTmE/dUPCm0ge/HWgsjXc7aglzolGBD t8SUOrZxGcFdhwSG7R7/s8Ay7pG7X/zdc6iayLsHMblcLQDXds+Eqa1uvb4fZ4Lly/i3f/ ZKb3BBC+NxRE5Ww8K11CKNaigCESMV7FLQvr9VEHrOgaRsmFRdx0bgIKzGqVkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9f192dd79cce2ea53a1cdc3ab64ea204a2fb9d84 commit 9f192dd79cce2ea53a1cdc3ab64ea204a2fb9d84 Author: Mark Johnston AuthorDate: 2022-01-14 20:00:01 +0000 Commit: Mark Johnston CommitDate: 2022-01-21 00:53:44 +0000 netbsd-tests: Fix the libc stat_socket test The test tries to connect a socket to a closed port at 127.0.0.1. It sets O_NONBLOCK on the socket first and expects to get EINPROGRESS from connect(2), but this is not guaranteed, ECONNREFUSED is possible. Handle both cases, and re-enable the test. PR: 240621 Sponsored by: The FreeBSD Foundation (cherry picked from commit 95c75073d3d1ca9dcae41784453172f199bb2c0f) --- contrib/netbsd-tests/lib/libc/sys/t_stat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/sys/t_stat.c b/contrib/netbsd-tests/lib/libc/sys/t_stat.c index 9d0136dae50b..029ff8452d94 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_stat.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_stat.c @@ -350,14 +350,14 @@ ATF_TC_BODY(stat_socket, tc) errno = 0; - ATF_REQUIRE_ERRNO(EINPROGRESS, - connect(fd, (struct sockaddr *)&addr, - sizeof(struct sockaddr_in)) == -1); + ATF_REQUIRE(connect(fd, (struct sockaddr *)&addr, + sizeof(struct sockaddr_in)) == -1); + ATF_REQUIRE(errno == EINPROGRESS || errno == ECONNREFUSED); errno = 0; if (fstat(fd, &st) != 0 || errno != 0) - atf_tc_fail("fstat(2) failed for a EINPROGRESS socket"); + atf_tc_fail("fstat(2) failed for a socket"); (void)close(fd); }