parent
1d0bafd9b0
commit
572a2f6886
|
@ -1808,9 +1808,9 @@ CHECK = \
|
||||||
prefix=`if test "$(@D)" = "regexp"; then echo regexp-test; else dirname $(@D); fi`; \
|
prefix=`if test "$(@D)" = "regexp"; then echo regexp-test; else dirname $(@D); fi`; \
|
||||||
test "$${prefix}" != "." || prefix="$(@D)"; \
|
test "$${prefix}" != "." || prefix="$(@D)"; \
|
||||||
if test "$(use_dejagnu)" = "yes"; then \
|
if test "$(use_dejagnu)" = "yes"; then \
|
||||||
$(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" $(GOTESTFLAGS); \
|
$(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" --goarch="$(GOARCH)" $(GOTESTFLAGS); \
|
||||||
else \
|
else \
|
||||||
if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS) >>$@-testlog 2>&1; then \
|
if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --goarch="$(GOARCH)" $(GOTESTFLAGS) >>$@-testlog 2>&1; then \
|
||||||
echo "PASS: $(@D)" >> $@-testlog; \
|
echo "PASS: $(@D)" >> $@-testlog; \
|
||||||
echo "PASS: $(@D)"; \
|
echo "PASS: $(@D)"; \
|
||||||
echo "PASS: $(@D)" > $@-testsum; \
|
echo "PASS: $(@D)" > $@-testsum; \
|
||||||
|
|
|
@ -2045,9 +2045,9 @@ CHECK = \
|
||||||
prefix=`if test "$(@D)" = "regexp"; then echo regexp-test; else dirname $(@D); fi`; \
|
prefix=`if test "$(@D)" = "regexp"; then echo regexp-test; else dirname $(@D); fi`; \
|
||||||
test "$${prefix}" != "." || prefix="$(@D)"; \
|
test "$${prefix}" != "." || prefix="$(@D)"; \
|
||||||
if test "$(use_dejagnu)" = "yes"; then \
|
if test "$(use_dejagnu)" = "yes"; then \
|
||||||
$(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" $(GOTESTFLAGS); \
|
$(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" --goarch="$(GOARCH)" $(GOTESTFLAGS); \
|
||||||
else \
|
else \
|
||||||
if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS) >>$@-testlog 2>&1; then \
|
if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --goarch="$(GOARCH)" $(GOTESTFLAGS) >>$@-testlog 2>&1; then \
|
||||||
echo "PASS: $(@D)" >> $@-testlog; \
|
echo "PASS: $(@D)" >> $@-testlog; \
|
||||||
echo "PASS: $(@D)"; \
|
echo "PASS: $(@D)"; \
|
||||||
echo "PASS: $(@D)" > $@-testsum; \
|
echo "PASS: $(@D)" > $@-testsum; \
|
||||||
|
|
|
@ -32,6 +32,7 @@ loop=true
|
||||||
keep=false
|
keep=false
|
||||||
prefix=
|
prefix=
|
||||||
dejagnu=no
|
dejagnu=no
|
||||||
|
GOARCH=""
|
||||||
timeout=240
|
timeout=240
|
||||||
testname=""
|
testname=""
|
||||||
trace=false
|
trace=false
|
||||||
|
@ -86,6 +87,15 @@ while $loop; do
|
||||||
dejagnu=`echo $1 | sed -e 's/^--dejagnu=//'`
|
dejagnu=`echo $1 | sed -e 's/^--dejagnu=//'`
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
x--goarch)
|
||||||
|
GOARCH=$2
|
||||||
|
shift
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
x--goarch=*)
|
||||||
|
GOARCH=`echo $1 | sed -e 's/^--goarch=//'`
|
||||||
|
shift
|
||||||
|
;;
|
||||||
x--timeout)
|
x--timeout)
|
||||||
timeout=$2
|
timeout=$2
|
||||||
shift
|
shift
|
||||||
|
@ -326,13 +336,18 @@ localname() {
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
|
text="T"
|
||||||
|
case "$GOARCH" in
|
||||||
|
ppc*) text="D" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
# test functions are named TestFoo
|
# test functions are named TestFoo
|
||||||
# the grep -v eliminates methods and other special names
|
# the grep -v eliminates methods and other special names
|
||||||
# that have multiple dots.
|
# that have multiple dots.
|
||||||
pattern='Test([^a-z].*)?'
|
pattern='Test([^a-z].*)?'
|
||||||
# The -p option tells GNU nm not to sort.
|
# The -p option tells GNU nm not to sort.
|
||||||
# The -v option tells Solaris nm to sort by value.
|
# The -v option tells Solaris nm to sort by value.
|
||||||
tests=$($NM -p -v _gotest_.o $xofile | egrep ' T .*\.'$pattern'$' | grep -v '\..*\..*\.' | fgrep -v '$' | sed 's/.* //' | sed 's/.*\.\(.*\.\)/\1/')
|
tests=$($NM -p -v _gotest_.o $xofile | egrep " $text .*\."$pattern'$' | grep -v '\..*\..*\.' | fgrep -v '$' | sed 's/.* //' | sed 's/.*\.\(.*\.\)/\1/')
|
||||||
if [ "x$tests" = x ]; then
|
if [ "x$tests" = x ]; then
|
||||||
echo 'gotest: warning: no tests matching '$pattern in _gotest_.o $xofile 1>&2
|
echo 'gotest: warning: no tests matching '$pattern in _gotest_.o $xofile 1>&2
|
||||||
exit 2
|
exit 2
|
||||||
|
|
Loading…
Reference in New Issue