From c404b3b9c6b7ecdfcfbe456ccc07821135b19c90 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Fri, 26 Oct 2018 02:43:35 +0000
Subject: [PATCH] libgo: don't use wc in gotest
The wc command is not in the GNU approved list of Makefile utilities
(https://www.gnu.org/prep/standards/html_node/Utilities-in-Makefiles.html#Utilities-in-Makefiles).
Reviewed-on: https://go-review.googlesource.com/c/144897
From-SVN: r265515
---
gcc/go/gofrontend/MERGE | 2 +-
libgo/testsuite/gotest | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 188ada01a3c6..ada5f3f731dc 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-407a59831ea4fbfe03f0887c40497b73939e7c44
+0a58bd7d820dac8931e8da5b291f19c3c7e6bee3
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest
index f1309aba39a3..0b2e572a9056 100755
--- a/libgo/testsuite/gotest
+++ b/libgo/testsuite/gotest
@@ -518,10 +518,9 @@ symtogo() {
local ndots=""
for tp in $*
do
- s=$(echo $tp | sed -e 's/\.\.z2f/%/g' | sed -e 's/.*%//')
+ s=$(echo "$tp" | sed -e 's/\.\.z2f/%/g' | sed -e 's/.*%//')
# screen out methods (X.Y.Z)
- ndots=$(echo $s | sed -e 's/\./ /g' | wc -w)
- if [ $ndots -ne 2 ]; then
+ if ! expr "$s" : '^[^.]*\.[^.]*$' >/dev/null 2>&1; then
continue
fi
if [ -z "${result}" ]; then
--
GitLab