diff --git a/gotools/ChangeLog b/gotools/ChangeLog index 8f9507561827feef6e59ffc11eec66ff939a1c19..9fbc221bb90cdf60345e761ad9c9245fcbb357db 100644 --- a/gotools/ChangeLog +++ b/gotools/ChangeLog @@ -1,3 +1,8 @@ +2017-06-16 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * Makefile.am (check-go-tool): Don't use >& for I/O redirection. + * Makefile.in: Regenerate. + 2017-06-14 Ian Lance Taylor <iant@golang.org> * Makefile.am (libgosrcdir): Define. diff --git a/gotools/Makefile.am b/gotools/Makefile.am index bde5e432531b9e8ae12b420b8c793147e27abbda..010c5bb554b4c5aaf4e41797bd438c91224173c7 100644 --- a/gotools/Makefile.am +++ b/gotools/Makefile.am @@ -180,7 +180,7 @@ check-go-tool: go$(EXEEXT) check-head check-gccgo $(CHECK_ENV) \ GOPATH=`cd check-go-dir && $(PWD_COMMAND)`; \ export GOPATH; \ - (cd check-go-dir/src/cmd/go && $(abs_builddir)/go$(EXEEXT) test -test.short -test.v) >& cmd_go-testlog || true + (cd check-go-dir/src/cmd/go && $(abs_builddir)/go$(EXEEXT) test -test.short -test.v) > cmd_go-testlog 2>&1 || true grep '^--- ' cmd_go-testlog | sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' # The check targets runs the tests and assembles the output files. diff --git a/gotools/Makefile.in b/gotools/Makefile.in index 9e42330c8be9d63e969de05d4de47415a3f0b04c..b57d89a9230df4b700123168d5a1428e7e6cfee1 100644 --- a/gotools/Makefile.in +++ b/gotools/Makefile.in @@ -582,8 +582,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@NATIVE_FALSE@install-exec-local: @NATIVE_FALSE@uninstall-local: +@NATIVE_FALSE@install-exec-local: clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \ @@ -737,7 +737,7 @@ s-zdefaultcc: Makefile @NATIVE_TRUE@ $(CHECK_ENV) \ @NATIVE_TRUE@ GOPATH=`cd check-go-dir && $(PWD_COMMAND)`; \ @NATIVE_TRUE@ export GOPATH; \ -@NATIVE_TRUE@ (cd check-go-dir/src/cmd/go && $(abs_builddir)/go$(EXEEXT) test -test.short -test.v) >& cmd_go-testlog || true +@NATIVE_TRUE@ (cd check-go-dir/src/cmd/go && $(abs_builddir)/go$(EXEEXT) test -test.short -test.v) > cmd_go-testlog 2>&1 || true @NATIVE_TRUE@ grep '^--- ' cmd_go-testlog | sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' # The check targets runs the tests and assembles the output files.