From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4BAB2159C9B for ; Wed, 7 Aug 2024 15:13:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 771832BC019; Wed, 7 Aug 2024 15:13:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5B7DD2BC019 for ; Wed, 7 Aug 2024 15:13:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4770B342FAB for ; Wed, 7 Aug 2024 15:13:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 570951B9A for ; Wed, 7 Aug 2024 15:13:19 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1723043581.5ca076594ad47b8347ebc9fd69b467a95846d005.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5ca076594ad47b8347ebc9fd69b467a95846d005 X-VCS-Branch: master Date: Wed, 7 Aug 2024 15:13:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 608ff701-a259-476f-b465-293500f172db X-Archives-Hash: fae057ccbfaeeac0dec1ee48a3cf4e7a commit: 5ca076594ad47b8347ebc9fd69b467a95846d005 Author: Sam James gentoo org> AuthorDate: Wed Aug 7 15:08:06 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Aug 7 15:13:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca07659 toolchain.eclass: another attempt at flag filtering for tests The previous method ends up confusing D because those flags don't work there... Try passing *FLAGS into RUNTESTFLAGS this time, like in https://gcc.gnu.org/wiki/Testing_GCC#Testing_a_different_target_from_the_current_host. This reverts commit 7eab20a224f411ef2660f4fecae22e28cad711e7 and commit f66787897a590b8c949d257e3a9107f8995f62ae. Signed-off-by: Sam James gentoo.org> eclass/toolchain.eclass | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index e81116973c67..550845b7dd47 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1947,24 +1947,25 @@ toolchain_src_test() { # Go doesn't support this and causes noisy warnings filter-flags -Wbuiltin-declaration-mismatch - local suppress_warn="/-Wno-format/-Wno-format-security/-Wno-trampolines" - GCC_TESTS_RUNTESTFLAGS+=" --target_board=unix\{${suppress_warn}" # TODO: Does this handle s390 (-m31) correctly? - is_multilib && GCC_TESTS_RUNTESTFLAGS+=",-m32/${suppress_warn}" - GCC_TESTS_RUNTESTFLAGS+="\}" + is_multilib && GCC_TESTS_RUNTESTFLAGS+=" --target_board=unix\{,-m32\}" + + GCC_TESTS_RUNTESTFLAGS=( + "${GCC_TESTS_RUNTESTFLAGS}" + CFLAGS_FOR_TARGET="${CFLAGS_FOR_TARGET:-${CFLAGS}}" + CXXFLAGS_FOR_TARGET="${CXXFLAGS_FOR_TARGET:-${CXXFLAGS}}" + LDFLAGS_FOR_TARGET="${LDFLAGS_FOR_TARGET:-${LDFLAGS}}" + CFLAGS="${CFLAGS}" + CXXFLAGS="${CXXFLAGS}" + FCFLAGS="${FCFLAGS}" + FFLAGS="${FFLAGS}" + LDFLAGS="${LDFLAGS}" + ) # nonfatal here as we die if the comparison below fails. Also, note that # the exit code of targets other than 'check' may be unreliable. nonfatal emake -C "${WORKDIR}"/build -k "${GCC_TESTS_CHECK_TARGET}" \ - RUNTESTFLAGS="${GCC_TESTS_RUNTESTFLAGS}" \ - CFLAGS_FOR_TARGET="${CFLAGS_FOR_TARGET:-${CFLAGS}}" \ - CXXFLAGS_FOR_TARGET="${CXXFLAGS_FOR_TARGET:-${CXXFLAGS}}" \ - LDFLAGS_FOR_TARGET="${LDFLAGS_FOR_TARGET:-${LDFLAGS}}" \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - FCFLAGS="${FCFLAGS}" \ - FFLAGS="${FFLAGS}" \ - LDFLAGS="${LDFLAGS}" + RUNTESTFLAGS="${GCC_TESTS_RUNTESTFLAGS[*]}" ) # Produce an updated failure manifest.