aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2011-01-11 23:37:05 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2011-01-11 23:37:05 +0000
commit21822c903b999d3e8f28d94d9c7ca00325ae90f2 (patch)
tree72dcbf25a43fb994391d3c79c252e6303f8ea14f
parent2e7e3e1de169a5599f9f895a8d5e2347b4cf3c14 (diff)
downloadgcc-21822c903b999d3e8f28d94d9c7ca00325ae90f2.zip
gcc-21822c903b999d3e8f28d94d9c7ca00325ae90f2.tar.gz
gcc-21822c903b999d3e8f28d94d9c7ca00325ae90f2.tar.bz2
Change libgo testsuite format to be more like DejaGNU.
From-SVN: r168685
-rw-r--r--libgo/Makefile.am12
-rw-r--r--libgo/Makefile.in12
2 files changed, 14 insertions, 10 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 54d6c3b..f5bb774 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 130c5e8..64a5f9a 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.