From nobody Wed May 25 00:18:17 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 E02DD1B3BC21; Wed, 25 May 2022 00:18:17 +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 4L7BVd4tv4z3mlB; Wed, 25 May 2022 00:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653437897; 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=Ho4XFG6iLR67l4V5L3NE2kHi3vXuRbdyns3JDd6RYR0=; b=VA0mshYr+6ok2QO8DLBDN9sZqVv03j6DBMX5y/Zzcre8OwHuFWNLTuoQtOuaEMa94oo+XF JrR/Qx4vEhoQeIioZavJ/5uD6ZIWCeF++y/w41N5PJEoyU8fdnWYFJPYhkYvXo19YZF66z ImtF2J6OSZsHCpf+OPsaoI3T+yccjsRpNpzhcJ+nTq0G4ZZcWbWfoXEOiXNGQeQS9fsJel aC95uEWZbUhx8Bz1nBp5FIgUrix1ZvgcfDVDb6tNrAlP+Hfx8Y/VLIEcyXb2DG6/0OUxtH zB+3t3dug621qYyBSPak8812zezvxnJpU2gndWla7igdsS2AOveH0HbvuD1yhg== 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 77EAC6963; Wed, 25 May 2022 00:18:17 +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 24P0IHoj006038; Wed, 25 May 2022 00:18:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24P0IHaY006037; Wed, 25 May 2022 00:18:17 GMT (envelope-from git) Date: Wed, 25 May 2022 00:18:17 GMT Message-Id: <202205250018.24P0IHaY006037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c728c56c870a - main - kqueue tests: Add file and line info to some test failure output 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/main X-Git-Reftype: branch X-Git-Commit: c728c56c870abe230e45cee5c477f0d890ebacef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653437897; 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=Ho4XFG6iLR67l4V5L3NE2kHi3vXuRbdyns3JDd6RYR0=; b=U8gvLvhGisF5arY/ZyzRy1iH3nlTmCKSEXTwI7Rko+rRcGbKpSNwtlt/xM84v5n6r+NSR3 RFqOhxB9Hs6y0m9anljW47nz4znfJ1+RFbNs3YWpjsOmIJHBbpJlxKYhKOhHyUNLtNXbv+ 19O7eafEADy6ap1OpBzXvu9bdEEU6TUTV6rEvgkOgNuoPu3a82eWefjj+F7F2g2+VCE83R cd1w5GOK0lP4tz69Ym/GtsbTby8dwmp5CG8t3hvg+jx0VZMjrzhugRJvTfiMHvmmjbmTuV Bv5qX9lBVCe3SVKh6NPs1Hi+617zUIedjIxQqhopHEQcQT+dPNBQ6TuWBxdkZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653437897; a=rsa-sha256; cv=none; b=jSpsWCPbn/CCq/76ItOWwxrX0t60LsCAqHm2Q06gGUBko0N3d1IjCEAl+mypd/8eHk4QFU oKw7aodXDq6ex9Ben8AhHIija+v3dQ9Ovd9W6mt6gL9zQh97d8q97eSv4PE8ZrCz6e5eaF QirRGYxmUOv1eQ0/UupPvmBVs6TeJq3BDAM8RtN92zH1EupcOJaavh6wSIojowqAsZfP5o hr+/KFAOUzyi450R3OzPCZ07A9MMXd0vyP4g8CZDdRyPnuEbi10uThtO4t5E5lm+GA0I8/ RH69js1AnL0Yb3g3bB7iK/KfRTJ1xIC6yQXLSrRiCpL5BonGwem/mgmeeVVcxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c728c56c870abe230e45cee5c477f0d890ebacef commit c728c56c870abe230e45cee5c477f0d890ebacef Author: Mark Johnston AuthorDate: 2022-05-25 00:14:20 +0000 Commit: Mark Johnston CommitDate: 2022-05-25 00:14:20 +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. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- 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 a92e544910ba..07ca908a114d 100644 --- a/tests/sys/kqueue/libkqueue/common.h +++ b/tests/sys/kqueue/libkqueue/common.h @@ -49,8 +49,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, @@ -72,7 +72,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();