From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.smtpout.orange.fr (smtp-18.smtpout.orange.fr [80.12.242.18]) by sourceware.org (Postfix) with ESMTPS id 5285F3858C5E for ; Fri, 11 Aug 2023 08:10:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5285F3858C5E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=gcc.gnu.org Received: from cyrano.home ([86.215.161.51]) by smtp.orange.fr with ESMTPA id UNE0qVB1hkHhaUNE5qwDjo; Fri, 11 Aug 2023 10:10:30 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1691741430; bh=MIfuoyYYsauye+JRhoajqRhaBoDDXcNPrOml9KdqlrA=; h=From:To:Subject:Date; b=slNwGpj0xzrZXyEfgWShdkgr3iQp0snV+f1cg8Jp2Em+pgwBfuPR5Jx2iSppHGLbM b9SZuQB4dgkGpimgA+jw6sqTF7s2BEnLPSUL+FxnhePoGiyNC28hNgy1RdgO80B7wx zVLIQImbNPFpP/FhMm9cZH+eHWNSX4FL6N/sgou/a/NQNxMefVd6JRFjCLy9SYBT6s 6jEL4NHOCnY1RWlkNcYU1hSmMmvayOPVDtS6KeCXURbtk/o+Gz4tWVxL0Se2QQFHHj xprhhmWc7ttTeUKG1fm04LXBOrwiNBZh3WzQhIMMUguy12RhjydkbGJkTnm+ErS119 GLhf9jMIIuJyQ== X-ME-Helo: cyrano.home X-ME-Auth: bW9yaW4tbWlrYWVsQG9yYW5nZS5mcg== X-ME-Date: Fri, 11 Aug 2023 10:10:30 +0200 X-ME-IP: 86.215.161.51 From: Mikael Morin To: gcc-patches@gcc.gnu.org Subject: [PATCH] dg-cmp-results: Escape slash from variant argument Date: Fri, 11 Aug 2023 10:10:23 +0200 Message-Id: <20230811081023.95408-1-mikael@gcc.gnu.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NEUTRAL,TXREP 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: Hello, I ran into a bug recently, running dg-cmp-results.sh with variant unix/-m32. This fixes it. OK for master? -- >8 -- Escape slash characters in $header variable (coming from the variant argument). This avoids runs with say "unix/-m32" as variant resulting in sed errors "unknown command: -". contrib/ChangeLog: * dg-cmp-results.sh: Escape slashes in $header to a new variable. Use the new variable in sed command. --- contrib/dg-cmp-results.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/dg-cmp-results.sh b/contrib/dg-cmp-results.sh index 33e0605dc50..7d17772dc75 100755 --- a/contrib/dg-cmp-results.sh +++ b/contrib/dg-cmp-results.sh @@ -90,8 +90,11 @@ sed $E -e '/^[[:space:]]+===/,$d' $OFILE echo "Newer log file: $NFILE" sed $E -e '/^[[:space:]]+===/,$d' $NFILE +# Escape occurences of / in $header before passing through sed. +header_pattern=`echo "$header" | sed $E -e 's:/:[/]:g'` + # Create a temporary file from the old file's interesting section. -sed $E -e "/$header/,/^[[:space:]]+===.*Summary ===/!d" \ +sed $E -e "/$header_pattern/,/^[[:space:]]+===.*Summary ===/!d" \ -e '/^[A-Z]+:/!d' \ -e '/^(WARNING|ERROR):/d' \ -e 's/\r$//' \ @@ -101,7 +104,7 @@ sed $E -e "/$header/,/^[[:space:]]+===.*Summary ===/!d" \ >$TMPDIR/o$$-$OBASE # Create a temporary file from the new file's interesting section. -sed $E -e "/$header/,/^[[:space:]]+===.*Summary ===/!d" \ +sed $E -e "/$header_pattern/,/^[[:space:]]+===.*Summary ===/!d" \ -e '/^[A-Z]+:/!d' \ -e '/^(WARNING|ERROR):/d' \ -e 's/\r$//' \ -- 2.40.1