diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-10-26 02:43:35 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-10-26 02:43:35 +0000 |
| commit | 904510f26886ee816217ffddac25b50dedc30956 (patch) | |
| tree | 512f46546e5285e84a6525cea9699e1bc536e3b2 | |
| parent | ef029ad92a15edb3d29558c296ee13c17cefa05c (diff) | |
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
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@265515 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rwxr-xr-x | libgo/testsuite/gotest | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 188ada01a3c..ada5f3f731d 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 f1309aba39a..0b2e572a905 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 |