From nobody Wed Oct 6 14:53:16 2021 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 BAA0917ED135; Wed, 6 Oct 2021 14:53:16 +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 4HPcrr4h33z3myc; Wed, 6 Oct 2021 14:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8104622228; Wed, 6 Oct 2021 14:53:16 +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 196ErGkx053091; Wed, 6 Oct 2021 14:53:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 196ErGAQ053090; Wed, 6 Oct 2021 14:53:16 GMT (envelope-from git) Date: Wed, 6 Oct 2021 14:53:16 GMT Message-Id: <202110061453.196ErGAQ053090@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: fb49012ca448 - stable/12 - tests: kqueue: CLOCK_BOOTTIME is an alias of CLOCK_UPTIME 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: fb49012ca448f3c7a9ae38ceaf700b8cd39be836 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=fb49012ca448f3c7a9ae38ceaf700b8cd39be836 commit fb49012ca448f3c7a9ae38ceaf700b8cd39be836 Author: Kyle Evans AuthorDate: 2021-10-06 14:50:32 +0000 Commit: Kyle Evans CommitDate: 2021-10-06 14:50:32 +0000 tests: kqueue: CLOCK_BOOTTIME is an alias of CLOCK_UPTIME Build-test should be done a buildenv from a newer branch. =-( We don't have this alias in stable/12, so just provide it locally in a way that won't break should 155f15118a77 find its way here. Reported by: Jenkins, naddy Fixes: f9765c9c1acb ("kqueue: don't arbitrarily restrict ...") --- tests/sys/kqueue/libkqueue/timer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/sys/kqueue/libkqueue/timer.c b/tests/sys/kqueue/libkqueue/timer.c index 81ab364b796c..9400ef1daa82 100644 --- a/tests/sys/kqueue/libkqueue/timer.c +++ b/tests/sys/kqueue/libkqueue/timer.c @@ -26,6 +26,9 @@ #define MS_TO_US(t) ((t) * THOUSAND) /* Convert milliseconds to microseconds. */ #define US_TO_NS(t) ((t) * THOUSAND) /* Convert microseconds to nanoseconds. */ +#ifndef CLOCK_BOOTTIME +#define CLOCK_BOOTTIME CLOCK_UPTIME +#endif /* Get the current time with microsecond precision. Used for * sub-second timing to make some timer tests run faster.