From patchwork Thu May 18 12:56:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 95854 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp470089vqo; Thu, 18 May 2023 05:58:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6EHVE3t74dz/1TM4+mDHyynoRkRzGsWHXp5S1kgzl4qukWkRabiUSwOc0mvWhXf/V4INMQ X-Received: by 2002:a17:907:9405:b0:94f:5e17:e80d with SMTP id dk5-20020a170907940500b0094f5e17e80dmr41544452ejc.45.1684414710436; Thu, 18 May 2023 05:58:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684414710; cv=none; d=google.com; s=arc-20160816; b=IJmxefMU5kKcdUp9RtQ0LV7fczrM8RNxCuyJ7wG7Nzm9p5USBFlgHV5trwpBd8ilMM Gi2jn7BpB4BGizopHfvyjqxTaOtoK3NUVUdyRj3EKo3zjOUXSzO8gaf7/XoQf2R/IQgs UGFrnGUdDZtwHdQrz3Io0aFM9sxBmLEqa3XnvERyHdSjwY/uJwrXWrNtVCnc5v4nG7sS v/v3iJnDZ1nQAyYyNc2qb2JHjeBenl0ZomEwQZpsyJ/T/Rov8OcLdkaFzQD2TXLMoc3G egVBhIG/o1lXI/CbmhvBNuOpvX/aNl9CfnseZQMWxAXZ+QZrVUK735qhOdg8Lu3+hqa0 9p9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=yZpTRIdSTv5+R5gEIQSr2mOSpL3Uh1V7NwVCpq7t9c8=; b=Eff/LeHYi6NX90FCvXtmmKAPdcqy2wT7hRZlhW7AW1vd8JUaltH9NE3DNKAlXgA/bQ +04/nuvKu7ZluzaoHDK0EfvGlvv5hTCUyRU2ZgqZo6jQYRCmC5G9ZNRX4/iyO7Dxu3Tp SLxjTVGjU969yvs87bJ725XhO1tifNKsnrsZH1QduyK+SwOYr3i/kZHt3F0HOfiLgN7A Z5vQUrW5JjW2NNPsRjcB0HRVHdp7RgCKeQkeCFqhioHwPw34L5pPWknQd3343Cd4wmov Eh2QzT5IcLY3P227vZ2Ypk+Pg67bL3QRGLfcR500plSPYEQafh57oMdKEX5gwg7s2GoT I2yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=lEWuOG2g; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id gn11-20020a1709070d0b00b0096f41a4fddfsi702734ejc.507.2023.05.18.05.58.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 05:58:30 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=lEWuOG2g; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9B5E53882652 for ; Thu, 18 May 2023 12:57:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B5E53882652 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684414661; bh=yZpTRIdSTv5+R5gEIQSr2mOSpL3Uh1V7NwVCpq7t9c8=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=lEWuOG2gd6PH3PVta3xvlnaKEmDpCWsUfNNvfXyDCodyrdlt6HA8EYtQg3TALzpO5 kaPHemwDlJXn6lhlEfg86rPMWeCDxg8/XKan2+Wfh+Cbl7BDI/MIk1noCcFTZoQjG0 4L9Udf2JuUSgppZ8BToaTSlK4xNjGUJuAHoqT47c= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 112D73858C5F for ; Thu, 18 May 2023 12:56:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 112D73858C5F Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-462-YCCX76jOPoWu55WW6N70xQ-1; Thu, 18 May 2023 08:56:53 -0400 X-MC-Unique: YCCX76jOPoWu55WW6N70xQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C7C3A85C074 for ; Thu, 18 May 2023 12:56:52 +0000 (UTC) Received: from localhost (unknown [10.42.28.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86272492B01 for ; Thu, 18 May 2023 12:56:52 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [PATCH 2/3] gcc: Fix nonportable shell syntax in "test" and "[" commands [PR105831] Date: Thu, 18 May 2023 13:56:46 +0100 Message-Id: <20230518125647.2105203-3-jwakely@redhat.com> In-Reply-To: <20230518125647.2105203-1-jwakely@redhat.com> References: <20230518125647.2105203-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766236839259319727?= X-GMAIL-MSGID: =?utf-8?q?1766236839259319727?= POSIX sh does not support the == for string comparisons, use = instead. The gen_directive_tests script uses a bash shebang so == does work, but there's no reason this script can't just use the more portable form anyway. PR bootstrap/105831 gcc/ChangeLog: * config.gcc: Use = operator instead of ==. gcc/testsuite/ChangeLog: * gcc.test-framework/gen_directive_tests: Use = operator instead of ==. --- gcc/config.gcc | 2 +- gcc/testsuite/gcc.test-framework/gen_directive_tests | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/config.gcc b/gcc/config.gcc index e08c67d7cde..d88071773c9 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2441,7 +2441,7 @@ riscv*-*-elf* | riscv*-*-rtems*) tmake_file="${tmake_file} riscv/t-rtems" ;; *) - if test "x${with_multilib_generator}" == xdefault; then + if test "x${with_multilib_generator}" = xdefault; then case "x${enable_multilib}" in xno) ;; xyes) tmake_file="${tmake_file} riscv/t-elf-multilib" ;; diff --git a/gcc/testsuite/gcc.test-framework/gen_directive_tests b/gcc/testsuite/gcc.test-framework/gen_directive_tests index 29f0a734877..87b3f3d1b40 100644 --- a/gcc/testsuite/gcc.test-framework/gen_directive_tests +++ b/gcc/testsuite/gcc.test-framework/gen_directive_tests @@ -283,8 +283,8 @@ one() { echo "${GOOD_PROG}" >> $FILE1 echo "${GOOD_PROG}" > $FILE2 - if [ "${FAIL_VERSION}" == "yes" ]; then - if [ "${EXP}" == "${EXP_PASS}" ]; then + if [ "${FAIL_VERSION}" = "yes" ]; then + if [ "${EXP}" = "${EXP_PASS}" ]; then NAME=${KIND}-${EXP_FAIL} else NAME=${KIND}-${EXP_XFAIL} @@ -322,8 +322,8 @@ two() { echo "${GOOD_PROG}" >> $FILE1 echo "${GOOD_PROG}" > $FILE2 - if [ "${FAIL_VERSION}" == "yes" ]; then - if [ "${EXP}" == "${EXP_PASS}" ]; then + if "yes" ]; then + if [ "${EXP}" = "${EXP_PASS}" ]; then NAME=${KIND1}-${KIND2}-${EXP_FAIL} else NAME=${KIND1}-${KIND2}-${EXP_XFAIL} @@ -364,8 +364,8 @@ three() { echo "${GOOD_PROG}" >> $FILE1 echo "${GOOD_PROG}" > $FILE2 - if [ "${FAIL_VERSION}" == "${yes}" ]; then - if [ "${EXP}" == "${EXP_PASS}" ]; then + if [ "${FAIL_VERSION}" = "${yes}" ]; then + if [ "${EXP}" = "${EXP_PASS}" ]; then NAME=${KIND1}-${KIND2}-${KIND3}-${EXP_FAIL} else NAME=${KIND1}-${KIND2}-${KIND3}-${EXP_XFAIL}