From patchwork Tue Feb 6 16:58:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Torbjorn SVENSSON X-Patchwork-Id: 1895850 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=foss.st.com header.i=@foss.st.com header.a=rsa-sha256 header.s=selector1 header.b=nEi+IrPp; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TTqHX1VgTz23g2 for ; Wed, 7 Feb 2024 04:00:08 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1368A3858408 for ; Tue, 6 Feb 2024 17:00:06 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) by sourceware.org (Postfix) with ESMTPS id CA9A53858C53 for ; Tue, 6 Feb 2024 16:59:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CA9A53858C53 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=foss.st.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CA9A53858C53 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=91.207.212.93 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707238762; cv=none; b=k2wOrCinrZ9jps/tKQeZYhJvUCU6Y40OqB6OTIhamqeKsj6TzC7DyG84LansQKMo3waDSaw0DjCsImMkZ6kt1Xg66aiuwaO0NqZuSzeZFdSku51FWPncHsopZVORFTb2BD+B3mPh4zZZ/brrPpya1DCbUNJYraXD9Y9BjAjaANc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707238762; c=relaxed/simple; bh=8w344WdOzJdqv5C3mLPvzRUzC+s88s8IAKcMK5MmouU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=BYsHhzvCeojoTesOwAWSniuTypHTJ6yO360Ll4AAqLE7jMBiknNcqCloRnJNg3SbK/udDjzZZVkhMwyFXfQtEkO9KEEY//lzKaktGn1sfURQr+N8xSCJqveu/BB/N9iFlSL7GTUkwRvpjCgfnvn1Ovz8fuIqYZScIhkt9IH3ljs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 416EtjnB025623; Tue, 6 Feb 2024 17:59:16 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h= from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=selector1; bh=pewn0u3lwz/fCNl8DZwH OvGTmpAnDfuMHtu+ee1laC4=; b=nEi+IrPpHZxBmotdOlcgrOA1iOQlpwYnn49C 2Nr79CHM53yz3O9eXH952p0drW+0sCjmeXqVVQ1+mEecTSoLZq8A7JFSQjcfRYz4 sFebIM5z+hIyDemO6/qCcSA5q1Nnm20aeOFHR0sg7X2OcgI3y6QnIGKI0BADkqc+ /1tkpJb7gF/rkBl5k2W9tPCG7DQW+VhN3iCVBaKYppVwOtSCHuEI6Fbr0XFDJMn4 Sa2hicW4E6fB0eiQERcVIiPIC5O5oidhcIgwGkmzRjoMdUD9dO0WDrOQw5k2Kfof hoF7+dOhLAlAadkmdrh2UUI53m4R01Gfn229VyRLfyn9fImf4Q== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3w1f63m7ae-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 06 Feb 2024 17:59:16 +0100 (CET) Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 2EBB0100058; Tue, 6 Feb 2024 17:59:15 +0100 (CET) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id F41002676C3; Tue, 6 Feb 2024 17:59:14 +0100 (CET) Received: from jkgcxl0004.jkg.st.com (10.74.22.255) by SHFDAG1NODE3.st.com (10.75.129.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 6 Feb 2024 17:59:14 +0100 From: =?utf-8?q?Torbj=C3=B6rn_SVENSSON?= To: CC: , =?utf-8?q?Torbj=C3=B6rn_SVENSSON?= Subject: [PATCH] testsuite: Pattern does not match when using --specs=nano.specs Date: Tue, 6 Feb 2024 17:58:26 +0100 Message-ID: <20240206165825.3602755-1-torbjorn.svensson@foss.st.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.74.22.255] X-ClientProxiedBy: SHFCAS1NODE1.st.com (10.75.129.72) To SHFDAG1NODE3.st.com (10.75.129.71) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-06_10,2024-01-31_01,2023-05-22_02 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Ok for trunk and releases/gcc-13? --- When running the testsuite for newlib nano, the --specs=nano.specs option is used. This option prepends cpp_unique_options with "-isystem =/include/newlib-nano" so that the newlib nano header files override the newlib standard ones. As the -isystem option is prepended, the -quiet option is no longer the first option to cc1. Adjust the test accordingly. Patch has been verified on Windows and Linux. gcc/testsuite/ChangeLog: * gcc.misc-tests/options.exp: Allow other options before the -quite option for cc1. Signed-off-by: Torbjörn SVENSSON --- gcc/testsuite/gcc.misc-tests/options.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/testsuite/gcc.misc-tests/options.exp b/gcc/testsuite/gcc.misc-tests/options.exp index ec026ecf77d..e7fcde87585 100644 --- a/gcc/testsuite/gcc.misc-tests/options.exp +++ b/gcc/testsuite/gcc.misc-tests/options.exp @@ -57,7 +57,7 @@ proc check_for_all_options {language gcc_options compiler_pattern as_pattern ld_ remote_file build delete $dumpfile } - if {![regexp -- "/${compiler}(\\.exe)? -quiet.*$compiler_pattern" $gcc_output]} { + if {![regexp -- "/${compiler}(\\.exe)? .*-quiet.*$compiler_pattern" $gcc_output]} { fail "$test (compiler options)" return }