From nobody Fri Jan 21 00:53:24 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 0E2751966E4F; Fri, 21 Jan 2022 00:53: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 4Jg18N6wyRz3RDj; Fri, 21 Jan 2022 00:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642726405; 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=31kkSdoBrx95DUIsI7CMVhBpFuW71LkRZyRo9flWW9k=; b=A7iI5yeiBJYRzulJjK5EV8kGYXn7eudXyoP98nLIeMFSAXnaX9V8G/ii9NkbeTv0CUCH5i 9I8uEzhZyM5Tr0dLrcpBO0+gKiYshwSvz2R/uYrsF1hXuQujHtxLcLs46ew3IsGPTb1fyg +9AX+bbIA9GK5Xbs/ctF3gtVcCyK16xHdezebSWkMo/CM0milc339E4VCP0uCjAQoUk/49 G9kj9D5jASo0IiG99nEESq0KaRauR9I18R3h4VClGG6y6ngPP5QeqmhSHCaEEqeFfOheZV t7VNHp5nquTJ9xsVOgFZ7QXJPAAfq2uoRzR7tahPh50hqJL2EZ9tDsXWcqAPZw== 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 CF63C1226D; Fri, 21 Jan 2022 00:53:24 +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 20L0rONQ080170; Fri, 21 Jan 2022 00:53:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20L0rOxX080169; Fri, 21 Jan 2022 00:53:24 GMT (envelope-from git) Date: Fri, 21 Jan 2022 00:53:24 GMT Message-Id: <202201210053.20L0rOxX080169@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: 812345b1d469 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 812345b1d469e5bb90f5487fef1e4ab16890cc7a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642726405; 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=31kkSdoBrx95DUIsI7CMVhBpFuW71LkRZyRo9flWW9k=; b=fKuob8qWpJKti5lFAhoCcTepDA+SKB9nBGerbXSNDVLU78QchjYO9I8BKbPOyfQqW7Uppm KA1glb6l9WmLVJIH8Y8Kd1qBy34BNoLLizLOWDwqy4c4EIx/v0rYVflJgow7sEA/ST9bLa PxcsJLQbKvxVT1NKygeXt1U8sX7S6UDNbXAsx84GqXgnGUAtmPP1Q/j4ZT/ZIrbJZOstyq 033DOpdR3TsUdeeO4XCqJ8EQvMuWYAdou1NFhY5VxtXha4cnQWucI0VYVaRDnRn9YwFrJ6 enb93yencclzS36SQ44aFhc324vcFh/tK1kXBQzoX+Ts4wblDRdqn3iucI6fBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642726405; a=rsa-sha256; cv=none; b=ZB1YsawXQibz5uK1OIdrhSDMTq0OKFErGJWdRYCpiyUfoYMu56nJzia1bx/kyeby1zoPkI IvFh5yZf1dtB/7ZsobNGDA+pRVI2Opoktn3rzBA+NSb+QA4V58l1iRQKwNd5frqgufhU9d oZ5CtpP0ox0ItOkykuHljm9Ibo+5QC+UcsT7bveESyTYjpFGSRHNfI0gjj5ZGvIEqotLff r8OypyXAj/3cCCGBc3ppqmDqAqR76Bea1d2OqWoDWpxeu2d1Ek6/cKwHV3Aby+qncGJ0kH 19Fe9Dg+BRj/ilasjAjIkzghzqnawSh79E5sVfllbaXuJiB7O2wnABaI6BOvZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=812345b1d469e5bb90f5487fef1e4ab16890cc7a commit 812345b1d469e5bb90f5487fef1e4ab16890cc7a Author: Mark Johnston AuthorDate: 2022-01-14 20:00:01 +0000 Commit: Mark Johnston CommitDate: 2022-01-21 00:52:36 +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 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/sys/t_stat.c b/contrib/netbsd-tests/lib/libc/sys/t_stat.c index 372a9093fac5..029ff8452d94 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_stat.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_stat.c @@ -332,9 +332,6 @@ ATF_TC_BODY(stat_socket, tc) uint32_t iaddr; int fd, flags; - if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) - atf_tc_skip("https://bugs.freebsd.org/240621"); - (void)memset(&st, 0, sizeof(struct stat)); (void)memset(&addr, 0, sizeof(struct sockaddr_in)); @@ -353,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); }