From nobody Tue May 16 01:09:35 2023 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 4QKynY4DpHz4BKw3; Tue, 16 May 2023 01:09:37 +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 4QKynY2NXhz3hkq; Tue, 16 May 2023 01:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684199377; 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=6fzfQVuiGDh8faw94wtn5VcjM8lxFMtieh7ADD0MDBA=; b=Li8XDkG7KQTITWPXbNFtXEWlnkeCGYnAS3VxOj/vyqat31FKEonUdyFeunbDEtqxk1pnS5 zx+fdG+K4Ic224Uua5dSoChMpkB9AmL0tuWnXcR7RG0yRQ+zAPrvgPHhy3c9rIK2mEfZMP lI1Kzephoe1y7Czv4xm4r7iHmLlxmrEDmGw/8IFM//3342bWN4i4/ty/SXimalpipcDwe7 NKtx1TOQUrL8prBjBIrQ+AthuUliqRq8DWQLLS4G+0FOu9iHBrZm6vlLK6Kt8yWjeI1ben 5QhxHxSekCA5qC4ctrQy1vRKiySjYgIN5fMjJp6qz7uLX8lpaShF/uc2AjjW+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684199377; 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=6fzfQVuiGDh8faw94wtn5VcjM8lxFMtieh7ADD0MDBA=; b=A1VyZcstBcOQYDlcr3FcQn+bkjSbZKkKoK5ZhepDDujRmwuaAnZYZ3iQ09KwoSCpyGJgE8 01k9Nt3vZGs9D8EPCnoDQmCyE/Zq9LOdmEUDJ2VXd6+YgfkyTUAYKqNgYOi2sjN6i2q4NF 8oOoW1S9C3gZNvMouJo1HfYSD0TqdILUtS3TTIr/9kLzvIX7Y8xAW7ytonKUqvkR7/hH54 pYaD1i0Oy4sHq2VUw4LmPGd9Aak21cy3BKi0r8+o6AcgmpieRdrh42PaISxNILPixkmUrv 8d55u/QvegQkMUTdGBugayxKVmhWB6N+UHSieRBRbhjAHva9zN9xXXgDcE8SAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684199377; a=rsa-sha256; cv=none; b=T8TlnyFKludbDqijg2talVCF9Qaq/M+5cmN11d4T+dxca6RJAPze8RidCbkgea3bL2K+Yf dCBb+ZHNjOWYgrVuLrSmOhdaz6X4gT6b4hsyG7BRVQe6vDCkCz9caEAcUHw4YJp0VXkqtD rMVH6hO/teMBWwr9pEgXlpgg+aCcRlw4v4QlF+MRjSggd2vWiPYE4+gsjYJwIZciVdBZDy IRrk2mFG69ldddFvzYti02SvQ5LoliyRz2FnJph2ivtsYp3TeBb0RIJQteX+T8XMnU1ds3 ACCf1WrzPtVX9Bv1yl7jSjCNvAeluzionYBOd+8ndmuu3OSlXX81Kz2uYHZcNg== 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 4QKynY1Sx8z12ds; Tue, 16 May 2023 01:09:36 +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 34G19ZDB095590; Tue, 16 May 2023 01:09:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34G19Zs0095589; Tue, 16 May 2023 01:09:35 GMT (envelope-from git) Date: Tue, 16 May 2023 01:09:35 GMT Message-Id: <202305160109.34G19Zs0095589@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 816129210ad4 - main - tests: Don't recurse into sys/compat32 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 816129210ad4f951059db2d942b8213ffe0a0f89 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=816129210ad4f951059db2d942b8213ffe0a0f89 commit 816129210ad4f951059db2d942b8213ffe0a0f89 Author: Jessica Clarke AuthorDate: 2023-05-16 01:06:34 +0000 Commit: Jessica Clarke CommitDate: 2023-05-16 01:06:34 +0000 tests: Don't recurse into sys/compat32 Stubbing out the whole file means it has no targets, so recursive makes fail with "don't know how to make X". We could fix that, but because the level above is adding it to TESTS_SUBDIRS it'll generate an include line for the subdirectory in its Kyuafile, which won't work (the problem that was previously seen on non-aarch64 in CI). Thus we really need to not even add it to TESTS_SUBDIRS in the first place. Reported by: Dan Mack Fixes: 28f66935d400 ("tests: Disable sys/compat32 and sys/compat32/aarch64 tests") --- tests/sys/Makefile | 3 ++- tests/sys/compat32/Makefile | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/sys/Makefile b/tests/sys/Makefile index 3e9a30105a1d..c4549e361f99 100644 --- a/tests/sys/Makefile +++ b/tests/sys/Makefile @@ -10,7 +10,8 @@ TESTS_SUBDIRS+= ${_audit} TESTS_SUBDIRS+= auditpipe TESTS_SUBDIRS+= capsicum TESTS_SUBDIRS+= ${_cddl} -TESTS_SUBDIRS+= compat32 +# XXX: Currently broken in CI +#TESTS_SUBDIRS+= compat32 TESTS_SUBDIRS+= devrandom TESTS_SUBDIRS+= fifo TESTS_SUBDIRS+= file diff --git a/tests/sys/compat32/Makefile b/tests/sys/compat32/Makefile index 3dd5ca218d00..31834de16246 100644 --- a/tests/sys/compat32/Makefile +++ b/tests/sys/compat32/Makefile @@ -1,8 +1,6 @@ -# XXX: Currently broken in CI -.if 0 + .if exists(${.CURDIR}/${MACHINE_ARCH}) SUBDIR+= ${MACHINE_ARCH} .endif .include -.endif