From 21822c903b999d3e8f28d94d9c7ca00325ae90f2 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 11 Jan 2011 23:37:05 +0000 Subject: [PATCH] Change libgo testsuite format to be more like DejaGNU. From-SVN: r168685 --- libgo/Makefile.am | 12 +++++++----- libgo/Makefile.in | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 54d6c3b1f30..f5bb774e63c 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -1316,13 +1316,15 @@ CHECK = \ MAKE="$(MAKE)"; \ export MAKE; \ rm -f $@-log; \ - echo -n "$(@D) " >$@-log 2>&1; \ prefix=`if test "$(@D)" = "regexp"; then echo regexp-test; else dirname $(@D); fi`; \ test "$${prefix}" != "." || prefix="$(@D)"; \ - $(srcdir)/testsuite/gotest --dejagnu=$(use_dejagnu) --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" >>$@-log 2>&1; \ - x=$$?; \ - cat $@-log; \ - exit $$x + if $(srcdir)/testsuite/gotest --dejagnu=$(use_dejagnu) --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" >>$@-log 2>&1; then \ + echo "PASS: $(@D)"; \ + else \ + echo "FAIL: $(@D)"; \ + cat $@-log; \ + exit 1; \ + fi # Build all packages before checking any. CHECK_DEPS = libgo.la libgobegin.a \ diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 130c5e874b7..64a5f9a09ec 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -1604,13 +1604,15 @@ CHECK = \ MAKE="$(MAKE)"; \ export MAKE; \ rm -f $@-log; \ - echo -n "$(@D) " >$@-log 2>&1; \ prefix=`if test "$(@D)" = "regexp"; then echo regexp-test; else dirname $(@D); fi`; \ test "$${prefix}" != "." || prefix="$(@D)"; \ - $(srcdir)/testsuite/gotest --dejagnu=$(use_dejagnu) --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" >>$@-log 2>&1; \ - x=$$?; \ - cat $@-log; \ - exit $$x + if $(srcdir)/testsuite/gotest --dejagnu=$(use_dejagnu) --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --prefix="libgo_$${prefix}" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" >>$@-log 2>&1; then \ + echo "PASS: $(@D)"; \ + else \ + echo "FAIL: $(@D)"; \ + cat $@-log; \ + exit 1; \ + fi # Build all packages before checking any. -- 2.30.2