From nobody Tue Aug 23 23:59:46 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 4MC5nG45tcz4ZdQr; Tue, 23 Aug 2022 23:59:46 +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 4MC5nG3cBNz3sph; Tue, 23 Aug 2022 23:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661299186; 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=8EyXCbD1OVQ9unXPYBAwdJa9Ap5/5EwegTFiwOdU4g8=; b=uRPrBMmrl0zRhannagC7rhJEim4r+tcb1Z505oScnbTPA5xd6NqRH6vgmP2KaOubjuUwKj uyC6d0pCI+NTGg5A2BYDpJ3CUJ+H5ARzpISbx3n6aEpKVfPagM42c/5NgOAqDSYpG2MJC4 cOAfA/g70GYcFUtVjadsttgz5h0zJRM7Dzjx6qcQmNPBy+Q3D1PVZz2zbw4beJqC3bO69C 83b5qsEI6ihVxiQN8d7WCZBWQj/cDCiZLIg4wQHCp0NVi6nIs14z+JEf2IV9yQATzapeuY Ye/pg4mJicKSQtMfH+51L5V9hcmNDeJdxKi0pqQw1XzaVWjxy7zTrSUDSXEAMA== 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 4MC5nG2hSHzpJs; Tue, 23 Aug 2022 23:59:46 +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 27NNxkGK016712; Tue, 23 Aug 2022 23:59:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27NNxkYW016711; Tue, 23 Aug 2022 23:59:46 GMT (envelope-from git) Date: Tue, 23 Aug 2022 23:59:46 GMT Message-Id: <202208232359.27NNxkYW016711@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: b66ab4c8b728 - stable/13 - tests: Handle platforms with MAXPAGESIZES < 2 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: b66ab4c8b728fd38abdb739838bfdd3877281908 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661299186; 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=8EyXCbD1OVQ9unXPYBAwdJa9Ap5/5EwegTFiwOdU4g8=; b=onKQSyDyVnTDBJHC/Cy9r8cU3fmCTSY/slPbB2/bHzw6wEtzuAT8/CEVuxdX38y/hkAL7F fufgjynIYQBdwPtiPfnJ7NA//eLoETJE3fAcWHnHrvWcOSKSrz295jCX/kRRxklinwpgk3 Vkxju+ez2myAUmT1CmcfO8SDYOHOhbfgmDEkXKhjhcCTqPCM9PgMvtqpf86eWxN9oJ+H7g CVvSGvgndg5jwcAU1q5R44zsGDgav28f6QAQlDVBFQR/4P9hlKjbEFBAeT8woe1DJFOOHa CixAdawZijlXNhPZdmiXex9qcImkaTdCdtNY67fgzmvKe/XBpKggmaWMAgB2+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661299186; a=rsa-sha256; cv=none; b=JMPj+Q6qdg2UDoaM/qM6qgccHgrdg9rSLyui3img/MyrZnrrW9AwlhAHAG2wOut1e8ZefO PO/pL6znnlMoCv9GVV5XjFRbVORR1lVBei6MeyrKh7E+9K8CBdjervl/7GgOM0kpQvimm/ 0RbeP/3ExggoPnCXUSRAxgPAhOR5QO2keRuRuOwRqpevG4Ndd/nDTH6gd1qSZaR3ukjoDG nASkDrX+OoHogm0R8m+LsByuPfzTCg5rdWuBLvcxH382KNSkOCUawM9Sd4jLIDSCp9I3o5 0/WVHMoo2Z3bLLebqKlvSiXLU7lfgxFm2U04lpAWcrR+E3kqAnsuzsCN8Vn1tA== 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=b66ab4c8b728fd38abdb739838bfdd3877281908 commit b66ab4c8b728fd38abdb739838bfdd3877281908 Author: Mark Johnston AuthorDate: 2022-08-23 23:48:06 +0000 Commit: Mark Johnston CommitDate: 2022-08-23 23:59:34 +0000 tests: Handle platforms with MAXPAGESIZES < 2 Reported by: Jenkins Fixes: 1dfa8b73f6a6 ("tests: Add more shared shadow regression tests") (cherry picked from commit 4b8feb5d61ace6d94cafb03288a53694e84c2e53) --- tests/sys/vm/shared_shadow_inval_test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/sys/vm/shared_shadow_inval_test.c b/tests/sys/vm/shared_shadow_inval_test.c index 8cd986b8ed99..c3a62296ffa4 100644 --- a/tests/sys/vm/shared_shadow_inval_test.c +++ b/tests/sys/vm/shared_shadow_inval_test.c @@ -365,7 +365,8 @@ do_shared_shadow_inval(bool lazy_cow) ATF_REQUIRE(sysctllen >= sizeof(size_t)); pagesize = pagesizes[0]; - largepagesize = sysctllen >= 2 * sizeof(size_t) && pagesizes[1] != 0 ? + largepagesize = MAXPAGESIZES >= 2 && + sysctllen >= 2 * sizeof(size_t) && pagesizes[1] != 0 ? pagesizes[1] : 2 * 1024 * 1024; for (unsigned int i = 0; i <= FLAG_MASK; i++) {