From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684414614; 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: in-reply-to:in-reply-to:references:references; bh=yZpTRIdSTv5+R5gEIQSr2mOSpL3Uh1V7NwVCpq7t9c8=; b=SwUrNh/8zEqjmHP/bZUm5/Wz5jkEGnM5CGqLrc4ltKYFwtRa2mdp7zbi/Tww0L0COVZKj6 vaXEgYku/TMai0dodloObA2RdRxMrN/Eb6tdDbES8HeSxge78ibuVW7UYvq22L9i0moRfO 3cZpic4BNaKZCzAHvZbzO7/vNeu813s= 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) From: Jonathan Wakely 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 Content-Type: text/plain Content-Transfer-Encoding: 8bit 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 List-Id: 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} -- 2.40.1