From patchwork Thu Feb 8 17:44:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Torbjorn SVENSSON X-Patchwork-Id: 1896679 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=wXjjfiF8; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; 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 [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4TW4CB1dRVz23h2 for ; Fri, 9 Feb 2024 04:45:40 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E5FB2385842C for ; Thu, 8 Feb 2024 17:45:36 +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 E96B33858C5F for ; Thu, 8 Feb 2024 17:45:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E96B33858C5F 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 E96B33858C5F 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=1707414320; cv=none; b=Kvcz7/hzpwAZSKYmzzIJTAhizCfgsdgmjrU6RYuDJTM9L4ulDpqyKcE8JU638l5dRC08ZBK8Xaai3vfb2KyQ9H/iwGk8IRTniKVhvc3fMRoSEQ6XoR4OkLlwxy2ExckpTmhfXZqw4YnZWX4ZjNclfku5TKFWWQRoCn7YkA0ywRM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707414320; c=relaxed/simple; bh=YPF3KZeT1iW0Zxlu8TaElEx33H3UrYM1lLyqtT3uA7o=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=foE0S1VaFsp0xVWd/Vd7JQdKKz1hivsDroURULci4l57GLRbwpzU/WigwSiSDGOCsC63dW34l5UeNLSqIkNV6CAdyyPsBePNoX1zN+Jl8EgUyrpvYwyAmtGClypz6zMoWgakuUUwjGV1MUbjw2wD/yPS3JvylCVyJjK8EYLMvT4= 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 418C4BA7029039; Thu, 8 Feb 2024 18:45:14 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s= selector1; bh=gf8pVdjIhHN5+FKGHscUk6iptxku3bcb2mTS+ftSM2Y=; b=wX jjfiF8yZ0LAttskzSHnpkSgLtgRHSDob1FD3eUMG8bcpX6ZPv0DlzsAw5U6HTUeQ pZ+I2mHlimyk+qDWjmm2wyNkd2L/UGPEFSeKoAn1MBemuMHxTJHM5Ctz4j8pzYfq KhCZeUPyc2cXtoboQ/M+PURee6IDW4GoqnlXwlLb0ebPznho25dWw2ZKrLCTW+5+ vJyM61q/DLI1G0N5ion4Pw+KwaSkUs81jI3L7x8+xIdetL/vTdHjkAXW/jztj+24 xrJNkr+KDLUEhAa8dZB5AH7e47Npb9RKZLA3wc8gz0JfPbvLUGKlDeWJ0tZd1paF P9U1J9V8IY082ZBq28ug== 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 3w1f63wp64-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Feb 2024 18:45:14 +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 88A45100051; Thu, 8 Feb 2024 18:45:13 +0100 (CET) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 5C99225225F; Thu, 8 Feb 2024 18:45:13 +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; Thu, 8 Feb 2024 18:45:13 +0100 From: =?utf-8?q?Torbj=C3=B6rn_SVENSSON?= To: CC: , =?utf-8?q?Torbj=C3=B6rn_SVENSSON?= Subject: [PATCH v2] testsuite: Pattern does not match when using --specs=nano.specs Date: Thu, 8 Feb 2024 18:44:32 +0100 Message-ID: <20240208174431.833656-1-torbjorn.svensson@foss.st.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <2E4E2779-D2ED-42CF-B6AC-69F72D52BF93@comcast.net> References: <2E4E2779-D2ED-42CF-B6AC-69F72D52BF93@comcast.net> 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-08_07,2024-02-08_01,2023-05-22_02 X-Spam-Status: No, score=-11.2 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 Changes since v1: - Replaced .* with [^\r\n]* to avoid matching newline. 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..6e6e40c183d 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)? \[^\r\n\]*-quiet.*$compiler_pattern" $gcc_output]} { fail "$test (compiler options)" return }