From nobody Wed Jun 08 00:44:57 2022 X-Original-To: dev-commits-src-branches@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 910A6842713; Wed, 8 Jun 2022 00:44:58 +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 4LHpQy2CBTz4nnF; Wed, 8 Jun 2022 00:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654649098; 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=HFO9+Pp019ZqKb8Th20TubIm+r2sUeavO1IwTxh77bA=; b=feQ1VFYXbONjg6XLyYiz5mlVYjPaKogdiENkvKdxO1XGZldjoLl/dnTir2IFqfQZj+a82D +rTrnGi8BtgxT5ZsipmkNdTrN7oyGxh+1PpbiSTYT62oN8GVS6cKbt7asfhDMm/4lDt88V 8cRc2wqyw4ytYK93EfkEA8YvryDheG66ZPxGPM6qn7ytfG5saqVcQQo/AgXDDchKh3kZhc Ec74v16mNb3Ws3+WPIg8lYjL48iSoC8KJULdLL1Gt7nhcVCsDrpvc7mPPjL4gQo1bu9w9O Aep8iW71Rjbulduj5y/KuDiIDjyoYkFN6bLbzxeAluaF8d8IrFVraI7pQLGWLg== 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 2391225567; Wed, 8 Jun 2022 00:44:58 +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 2580iv6V060637; Wed, 8 Jun 2022 00:44:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2580ivUt060636; Wed, 8 Jun 2022 00:44:57 GMT (envelope-from git) Date: Wed, 8 Jun 2022 00:44:57 GMT Message-Id: <202206080044.2580ivUt060636@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: c87ff7f5c659 - stable/13 - kqueue tests: Add file and line info to some test failure output List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: c87ff7f5c659ecab2c7092dd81c4a981d001f9f4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654649098; 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=HFO9+Pp019ZqKb8Th20TubIm+r2sUeavO1IwTxh77bA=; b=skPkUSEjPQoTRXJbT+HtlLzKIGYkCyNCcC8KE0ST/6o3ESBkEs4YT95RvY5XOrrKi5XsaX MRZapUv8tlncg4JA6Ms5ugZKoCNjVFO7zyx8wK8vxTApbKRTBnguWuvEf9/e9zcStlLf+q V7cAW466K8Ddf6MQyjbc6G4kGkQg4WQ2kILJbPTX7OxTGhwU0dI4vMsssImJg5nfmib6rB WUIPbDdb9F2iT+vCpf+fQaUZYo+Iz75BFGyAEEmi79b48s1xfwHIFaHkepl+QIZFnghtaf o1kPDu2p8xgauxyu3pECbfoAUxFKwYge2Okdff/WtxVQ5S8JgJot4gWBCWHZ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654649098; a=rsa-sha256; cv=none; b=lH6pyURMi/3/FVDitHuWL2uN1fvVdlPtucurLI30F6kDAPy477xip5Jn0j+qeQA5HGnI/2 kc+vZTrcmxHfCP9s6KAXTbiff1mWEKcd4t+l3tl5a94WfqP0fk7bblcStbKunFsniLzECg ae3pqDO+qyneAqEhz1pEAtTI4hWqQ+O8o0dl6sS9TZAIaxYGY7Ie8Uiw3bbd3nVJKcwKJV BaSrSQiv+sMHG2su0V95nWiyD7eBR5/yom/sixnOVG6fOmHEpMQbC01Gpg4fZLH58R4sIa iw9OuKGyjlA+9XX6Cq2v0zhlumq5tCECkJdKxDK1wTx+xo9ikTWpMkZmQUYzcg== 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=c87ff7f5c659ecab2c7092dd81c4a981d001f9f4 commit c87ff7f5c659ecab2c7092dd81c4a981d001f9f4 Author: Mark Johnston AuthorDate: 2022-05-25 00:14:20 +0000 Commit: Mark Johnston CommitDate: 2022-06-08 00:42:18 +0000 kqueue tests: Add file and line info to some test failure output This brings us slightly closer to upstream and is useful when debugging test failures. Sponsored by: The FreeBSD Foundation (cherry picked from commit c728c56c870abe230e45cee5c477f0d890ebacef) --- tests/sys/kqueue/libkqueue/common.h | 7 ++++--- tests/sys/kqueue/libkqueue/main.c | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/sys/kqueue/libkqueue/common.h b/tests/sys/kqueue/libkqueue/common.h index d621a8bf1e00..58074b61a555 100644 --- a/tests/sys/kqueue/libkqueue/common.h +++ b/tests/sys/kqueue/libkqueue/common.h @@ -47,8 +47,8 @@ char * kevent_to_str(struct kevent *); struct kevent * kevent_get(int); struct kevent * kevent_get_timeout(int, int); - -void kevent_cmp(struct kevent *, struct kevent *); +#define kevent_cmp(a,b) _kevent_cmp(a,b, __FILE__, __LINE__) +void _kevent_cmp(struct kevent *expected, struct kevent *got, const char *file, int line); void kevent_add(int kqfd, struct kevent *kev, @@ -70,7 +70,8 @@ kevent_add(int kqfd, struct kevent *kev, } while (0); /* Checks if any events are pending, which is an error. */ -void test_no_kevents(void); +#define test_no_kevents() _test_no_kevents(__FILE__, __LINE__) +void _test_no_kevents(const char *, int); void test_no_kevents_quietly(void); void test_begin(const char *); diff --git a/tests/sys/kqueue/libkqueue/main.c b/tests/sys/kqueue/libkqueue/main.c index 5b37b0f1fb63..3e586faf7380 100644 --- a/tests/sys/kqueue/libkqueue/main.c +++ b/tests/sys/kqueue/libkqueue/main.c @@ -27,7 +27,7 @@ static int testnum = 1; /* Checks if any events are pending, which is an error. */ void -test_no_kevents(void) +_test_no_kevents(const char *file, int line) { int nfds; struct timespec timeo; @@ -38,7 +38,7 @@ test_no_kevents(void) memset(&timeo, 0, sizeof(timeo)); nfds = kevent(kqfd, NULL, 0, &kev, 1, &timeo); if (nfds != 0) { - puts("\nUnexpected event:"); + printf("\n[%s:%d]: Unexpected event:", file, line); kev_str = kevent_to_str(&kev); puts(kev_str); free(kev_str); @@ -239,7 +239,7 @@ kevent_add(int fd, struct kevent *kev, } void -kevent_cmp(struct kevent *k1, struct kevent *k2) +_kevent_cmp(struct kevent *k1, struct kevent *k2, const char *file, int line) { char *kev1_str; char *kev2_str; @@ -258,8 +258,8 @@ kevent_cmp(struct kevent *k1, struct kevent *k2) k1->ext[0] != k2->ext[2] || k1->ext[0] != k2->ext[3]) { kev1_str = kevent_to_str(k1); kev2_str = kevent_to_str(k2); - printf("kevent_cmp: mismatch:\n %s !=\n %s\n", - kev1_str, kev2_str); + printf("[%s:%d]: kevent_cmp: mismatch:\n %s !=\n %s\n", + file, line, kev1_str, kev2_str); free(kev1_str); free(kev2_str); abort();