From c7aca2ff21800e3101a0c177151d70fda008484c Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 12 Jan 2011 23:06:13 +0000 Subject: [PATCH] Use correct nm and nm options. From-SVN: r168730 --- libgo/testsuite/gotest | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest index e8c0847a801..7c4bc4af8d4 100755 --- a/libgo/testsuite/gotest +++ b/libgo/testsuite/gotest @@ -19,6 +19,8 @@ GL=${GL:-${GC-gccgo}} GOLIBS= export GC GL GOLIBS +NM=${NM:-nm} + # srcdir is where the source files are found. basedir is where the # source file paths are relative to. # gofiles are the test files. pkgfiles are the source files. @@ -272,7 +274,7 @@ fi # the grep -v eliminates methods and other special names # that have multiple dots. pattern='Test([^a-z].*)?' - tests=$(nm -s _gotest_.o $xofile | egrep ' T .*\.'$pattern'$' | grep -v '\..*\..*\.' | sed 's/.* //' | sed 's/.*\.\(.*\.\)/\1/') + tests=$($NM -p _gotest_.o $xofile | egrep ' T .*\.'$pattern'$' | grep -v '\..*\..*\.' | sed 's/.* //' | sed 's/.*\.\(.*\.\)/\1/') if [ "x$tests" = x ]; then echo 'gotest: warning: no tests matching '$pattern in _gotest_.o $xofile 1>&2 exit 2