From d3deca3973e33b57871aa1067118066dc8a45de9 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 9 Feb 2013 23:19:33 +0000 Subject: [PATCH] re PR go/56017 (libgo testsuite does not support cross testing) PR go/56017 libgo testsuite: If using DejaGNU, don't frob the log file. From-SVN: r195927 --- libgo/Makefile.am | 5 ++++- libgo/Makefile.in | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 4ba3145daabf..77ab95afdcbd 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -3848,7 +3848,10 @@ check-head: @echo >> libgo.head check-tail: check-recursive check-multi - @lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \ + @if test "$(USE_DEJAGNU)" = "yes"; then \ + exit 0; \ + fi; \ + lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \ for dir in . $(MULTIDIRS); do \ mv ../$${dir}/$${lib}/libgo.sum ../$${dir}/$${lib}/libgo.sum.sep; \ mv ../$${dir}/$${lib}/libgo.log ../$${dir}/$${lib}/libgo.log.sep; \ diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 1376d566d6dd..15f027f15e74 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -6142,7 +6142,10 @@ check-head: @echo >> libgo.head check-tail: check-recursive check-multi - @lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \ + @if test "$(USE_DEJAGNU)" = "yes"; then \ + exit 0; \ + fi; \ + lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \ for dir in . $(MULTIDIRS); do \ mv ../$${dir}/$${lib}/libgo.sum ../$${dir}/$${lib}/libgo.sum.sep; \ mv ../$${dir}/$${lib}/libgo.log ../$${dir}/$${lib}/libgo.log.sep; \ -- 2.47.3