summaryrefslogtreecommitdiff
path: root/gotools
diff options
context:
space:
mode:
authorRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2017-06-16 06:58:06 +0000
committerRainer Orth <ro@gcc.gnu.org>2017-06-16 06:58:06 +0000
commit0186cacf9560ba0572b23e01085c3b00fbe38f56 (patch)
tree660daaf7566abad3712f2eec63ae325d0b365307 /gotools
parent7d594224c2375ae5b067b727a46c42b6ddc86de2 (diff)
Don't use >& for I/O redirection
* Makefile.am (check-go-tool): Don't use >& for I/O redirection. * Makefile.in: Regenerate. From-SVN: r249236
Diffstat (limited to 'gotools')
-rw-r--r--gotools/ChangeLog5
-rw-r--r--gotools/Makefile.am2
-rw-r--r--gotools/Makefile.in4
3 files changed, 8 insertions, 3 deletions
diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index 8f950756182..9fbc221bb90 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 bde5e432531..010c5bb554b 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 9e42330c8be..b57d89a9230 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.