Change libgo testsuite format to be more like DejaGNU.

From-SVN: r168685

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 54d6c3b1f30eb4aa9f5201176d6ac294d19865f9..f5bb774e63cff0a3ad9c0a61f024e259cf63ca48 100644 (file)
--- 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 130c5e874b747b443f64f472619558c0275ee378..64a5f9a09ecb737c68c49970ecf74202949490b9 100644 (file)
--- 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.