From nobody Wed Mar 02 21:57:18 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 14F2519E0654; Wed, 2 Mar 2022 21:57:19 +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 4K87JG3Czjz3KGm; Wed, 2 Mar 2022 21:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646258238; 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=QCJqHMSjg5T+hW1ZHJ4nf9PSd+l36p+2V6NMOXLjUz4=; b=SvzYIOfa2Gme589IiFkCpr3cHDqZV7oa0pPBICMIcD3vKRpXhSUnqsWLSKX9iIn/33q78k BmrCzqrYOl/R5T6S+yGtIuVp01oaVRbdEOqrnaqLf1Gv+ZiGAN3yplYo4AykmPRNGlVHdr /FwMr7lOAf5rhi0PKkiNNP4RPo7S8WqYNO/esxatT5JM2n/f3F8Zl51IecHy9Z+yFAQ74J InqgPJXSpbdWhrLOd1SG+UPmEZCnzTDA7o/OLV9fB0apDeRURfdPqPwWUB9vrEhTjnrd5V eqM1sVQNJsWuPsMQ+gKzTcVPwG/lDNvksdTCY9DVbIS2I182GZYfZd/0wHHnIQ== 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 334203A86; Wed, 2 Mar 2022 21:57:18 +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 222LvION065042; Wed, 2 Mar 2022 21:57:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 222LvIpl065041; Wed, 2 Mar 2022 21:57:18 GMT (envelope-from git) Date: Wed, 2 Mar 2022 21:57:18 GMT Message-Id: <202203022157.222LvIpl065041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric van Gyzen Subject: git: 77f0c44e49ba - stable/13 - aio_md_test: fix cleanup 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: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 77f0c44e49ba8aec89b65d095122c47d93930d0f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646258238; 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=QCJqHMSjg5T+hW1ZHJ4nf9PSd+l36p+2V6NMOXLjUz4=; b=XXEti9J5YcIPN2zxuSKT2R26QKmJgjf3naEPvgv51HaDtf0O6drmI4xh3oyFC9bsEVmaZ0 +W+uWf9DUzPzq2HLFzrywKZlbycGmtu4QYoClCZftGjhCqCnyi7cvw7wF0E9NXW/Sxp4L9 wd+MxaqBRI1ugGi9xps9wq5rJVLA+1Dao7Apeg5BUIsTSgWVlUKjlMSNxbQIhPNYwXKixy YnAO+KDepyeRsmMVuSiFInwb4bfwAjVJozAuSLwTZJeRUU6+dqT44Rm39Oh0jJlKf707nI sRkyiywz9BppFDsUinoc/PwW7EoeMEeRVI09VYuOu22+MnCXcVWk8bEdEH7K/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646258238; a=rsa-sha256; cv=none; b=KQ05UhwDm1wITBBgQRM+43ETHaQr2yUvS7UyrxdGanJ1ipeQFqnOtAxFoKJDh5/2Th5mUv fuealGE/zbtt+KrC2taMlMf1saqPzQt/uoCfu+5kBtkMx1ImFCyDIzSZyx2roTzyyjQAMQ 0KLcTL+zAigkSO40iY3H0cKs9OwTBztpwtvETwZpV8Tbw8CFvFKv3whYzPeFT8NT4wF/wf AcWgP9ev0HYlFCuW4V+LsHX6dL5iN9sNcNa9LRL6j+jmP2Cg0TXT1XGRrBIYA1WYEFQf0h hpwod3JOFPTdQUUL4s1Nnb6LjLQGgDLgChUR3b1MtnnlwllpjrGf2qq0ga6CNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=77f0c44e49ba8aec89b65d095122c47d93930d0f commit 77f0c44e49ba8aec89b65d095122c47d93930d0f Author: Eric van Gyzen AuthorDate: 2021-07-23 13:24:52 +0000 Commit: Eric van Gyzen CommitDate: 2022-03-02 21:56:30 +0000 aio_md_test: fix cleanup ATF cleanup functions cannot use functions such as ATF_REQUIRE and atf_tc_fail. These functions assert that a test case is currently running, which is not true during cleanup, so the process aborts. Change the cleanup function to simply print to stderr and return. MFC after: 1 week Sponsored by: Dell EMC Isilon (cherry picked from commit c6f92e64b6140f9e095b41687ff09ff973c28e14) --- tests/sys/aio/aio_test.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/sys/aio/aio_test.c b/tests/sys/aio/aio_test.c index 86c41fa469ea..af2e3823d1ff 100644 --- a/tests/sys/aio/aio_test.c +++ b/tests/sys/aio/aio_test.c @@ -758,11 +758,15 @@ static void aio_md_cleanup(void) { struct md_ioctl mdio; - int mdctl_fd, error, n, unit; + int mdctl_fd, n, unit; char buf[80]; mdctl_fd = open("/dev/" MDCTL_NAME, O_RDWR, 0); - ATF_REQUIRE(mdctl_fd >= 0); + if (mdctl_fd < 0) { + fprintf(stderr, "opening /dev/%s failed: %s\n", MDCTL_NAME, + strerror(errno)); + return; + } n = readlink(MDUNIT_LINK, buf, sizeof(buf)); if (n > 0) { if (sscanf(buf, "%d", &unit) == 1 && unit >= 0) { @@ -770,11 +774,9 @@ aio_md_cleanup(void) mdio.md_version = MDIOVERSION; mdio.md_unit = unit; if (ioctl(mdctl_fd, MDIOCDETACH, &mdio) == -1) { - error = errno; - close(mdctl_fd); - errno = error; - atf_tc_fail("ioctl MDIOCDETACH failed: %s", - strerror(errno)); + fprintf(stderr, + "ioctl MDIOCDETACH unit %d failed: %s\n", + unit, strerror(errno)); } } }