summaryrefslogtreecommitdiff
path: root/gotools
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2019-01-18 19:04:36 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-01-18 19:04:36 +0000
commit4f4a855d82a889cebcfca150a7a43909bcb6a346 (patch)
treef12bae0781920fa34669fe30b6f4615a86d9fb80 /gotools
parent225220d668dafb8262db7012bced688acbe63b33 (diff)
downloadgcc-4f4a855d82a889cebcfca150a7a43909bcb6a346.tar.gz
libgo: update to Go1.12beta2
Reviewed-on: https://go-review.googlesource.com/c/158019 gotools/: * Makefile.am (go_cmd_vet_files): Update for Go1.12beta2 release. (GOTOOLS_TEST_TIMEOUT): Increase to 600. (check-runtime): Export LD_LIBRARY_PATH before computing GOARCH and GOOS. (check-vet): Copy golang.org/x/tools into check-vet-dir. * Makefile.in: Regenerate. gcc/testsuite/: * go.go-torture/execute/names-1.go: Stop using debug/xcoff, which is no longer externally visible. From-SVN: r268084
Diffstat (limited to 'gotools')
-rw-r--r--gotools/ChangeLog9
-rw-r--r--gotools/Makefile.am31
-rw-r--r--gotools/Makefile.in31
3 files changed, 19 insertions, 52 deletions
diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index a9273eabcc9..ff5020ac2a1 100644
--- a/gotools/ChangeLog
+++ b/gotools/ChangeLog
@@ -1,3 +1,12 @@
+2019-01-18 Ian Lance Taylor <iant@golang.org>
+
+ * Makefile.am (go_cmd_vet_files): Update for Go1.12beta2 release.
+ (GOTOOLS_TEST_TIMEOUT): Increase to 600.
+ (check-runtime): Export LD_LIBRARY_PATH before computing GOARCH
+ and GOOS.
+ (check-vet): Copy golang.org/x/tools into check-vet-dir.
+ * Makefile.in: Regenerate.
+
2018-10-31 Joseph Myers <joseph@codesourcery.com>
PR bootstrap/82856
diff --git a/gotools/Makefile.am b/gotools/Makefile.am
index 55f83f20255..ad0ad24e206 100644
--- a/gotools/Makefile.am
+++ b/gotools/Makefile.am
@@ -70,31 +70,8 @@ go_cmd_cgo_files = \
$(cmdsrcdir)/cgo/util.go
go_cmd_vet_files = \
- $(cmdsrcdir)/vet/asmdecl.go \
- $(cmdsrcdir)/vet/assign.go \
- $(cmdsrcdir)/vet/atomic.go \
- $(cmdsrcdir)/vet/bool.go \
- $(cmdsrcdir)/vet/buildtag.go \
- $(cmdsrcdir)/vet/cgo.go \
- $(cmdsrcdir)/vet/composite.go \
- $(cmdsrcdir)/vet/copylock.go \
- $(cmdsrcdir)/vet/deadcode.go \
- $(cmdsrcdir)/vet/dead.go \
$(cmdsrcdir)/vet/doc.go \
- $(cmdsrcdir)/vet/httpresponse.go \
- $(cmdsrcdir)/vet/lostcancel.go \
- $(cmdsrcdir)/vet/main.go \
- $(cmdsrcdir)/vet/method.go \
- $(cmdsrcdir)/vet/nilfunc.go \
- $(cmdsrcdir)/vet/print.go \
- $(cmdsrcdir)/vet/rangeloop.go \
- $(cmdsrcdir)/vet/shadow.go \
- $(cmdsrcdir)/vet/shift.go \
- $(cmdsrcdir)/vet/structtag.go \
- $(cmdsrcdir)/vet/tests.go \
- $(cmdsrcdir)/vet/types.go \
- $(cmdsrcdir)/vet/unsafeptr.go \
- $(cmdsrcdir)/vet/unused.go
+ $(cmdsrcdir)/vet/main.go
go_cmd_buildid_files = \
$(cmdsrcdir)/buildid/buildid.go \
@@ -163,7 +140,7 @@ uninstall-local:
GOTESTFLAGS =
# Number of seconds before tests time out.
-GOTOOLS_TEST_TIMEOUT = 480
+GOTOOLS_TEST_TIMEOUT = 600
# Run tests using the go tool, and frob the output to look like that
# generated by DejaGNU. The main output of this is two files:
@@ -256,6 +233,7 @@ check-runtime: go$(EXEEXT) $(noinst_PROGRAMS) check-head check-gccgo check-gcc
$(MKDIR_P) check-runtime-dir
@abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \
LD_LIBRARY_PATH=`echo $${abs_libgodir}/.libs:$${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \
+ export LD_LIBRARY_PATH; \
GOARCH=`$(abs_builddir)/go$(EXEEXT) env GOARCH`; \
GOOS=`$(abs_builddir)/go$(EXEEXT) env GOOS`; \
files=`$(SHELL) $(libgosrcdir)/../match.sh --goarch=$${GOARCH} --goos=$${GOOS} --srcdir=$(libgosrcdir)/runtime --extrafiles="$(libgodir)/runtime_sysinfo.go $(libgodir)/sigtab.go" --tag=libffi`; \
@@ -299,10 +277,11 @@ check-carchive-test: go$(EXEEXT) $(noinst_PROGRAMS) check-head check-gccgo check
# check-vet runs `go test cmd/vet` in our environment.
check-vet: go$(EXEEXT) $(noinst_PROGRAMS) check-head check-gccgo check-gcc
rm -rf check-vet-dir cmd_vet-testlog
- $(MKDIR_P) check-vet-dir/src/cmd/internal
+ $(MKDIR_P) check-vet-dir/src/cmd/internal check-vet-dir/src/cmd/vendor/golang.org/x
cp -r $(cmdsrcdir)/vet check-vet-dir/src/cmd/
cp -r $(cmdsrcdir)/internal/objabi check-vet-dir/src/cmd/internal
cp $(libgodir)/objabi.go check-vet-dir/src/cmd/internal/objabi/
+ cp -r $(libgosrcdir)/golang.org/x/tools check-vet-dir/src/cmd/vendor/golang.org/x/
@abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \
abs_checkdir=`cd check-vet-dir && $(PWD_COMMAND)`; \
echo "cd check-vet-dir/src/cmd/vet && $(ECHO_ENV) GOPATH=$${abs_checkdir} $(abs_builddir)/go$(EXEEXT) test -test.short -test.timeout=$(GOTOOLS_TEST_TIMEOUT)s -test.v" > cmd_vet-testlog
diff --git a/gotools/Makefile.in b/gotools/Makefile.in
index d1db6316c1d..47235df52ae 100644
--- a/gotools/Makefile.in
+++ b/gotools/Makefile.in
@@ -373,31 +373,8 @@ go_cmd_cgo_files = \
$(cmdsrcdir)/cgo/util.go
go_cmd_vet_files = \
- $(cmdsrcdir)/vet/asmdecl.go \
- $(cmdsrcdir)/vet/assign.go \
- $(cmdsrcdir)/vet/atomic.go \
- $(cmdsrcdir)/vet/bool.go \
- $(cmdsrcdir)/vet/buildtag.go \
- $(cmdsrcdir)/vet/cgo.go \
- $(cmdsrcdir)/vet/composite.go \
- $(cmdsrcdir)/vet/copylock.go \
- $(cmdsrcdir)/vet/deadcode.go \
- $(cmdsrcdir)/vet/dead.go \
$(cmdsrcdir)/vet/doc.go \
- $(cmdsrcdir)/vet/httpresponse.go \
- $(cmdsrcdir)/vet/lostcancel.go \
- $(cmdsrcdir)/vet/main.go \
- $(cmdsrcdir)/vet/method.go \
- $(cmdsrcdir)/vet/nilfunc.go \
- $(cmdsrcdir)/vet/print.go \
- $(cmdsrcdir)/vet/rangeloop.go \
- $(cmdsrcdir)/vet/shadow.go \
- $(cmdsrcdir)/vet/shift.go \
- $(cmdsrcdir)/vet/structtag.go \
- $(cmdsrcdir)/vet/tests.go \
- $(cmdsrcdir)/vet/types.go \
- $(cmdsrcdir)/vet/unsafeptr.go \
- $(cmdsrcdir)/vet/unused.go
+ $(cmdsrcdir)/vet/main.go
go_cmd_buildid_files = \
$(cmdsrcdir)/buildid/buildid.go \
@@ -726,8 +703,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 \
@@ -927,6 +904,7 @@ mostlyclean-local:
@NATIVE_TRUE@ $(MKDIR_P) check-runtime-dir
@NATIVE_TRUE@ @abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \
@NATIVE_TRUE@ LD_LIBRARY_PATH=`echo $${abs_libgodir}/.libs:$${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \
+@NATIVE_TRUE@ export LD_LIBRARY_PATH; \
@NATIVE_TRUE@ GOARCH=`$(abs_builddir)/go$(EXEEXT) env GOARCH`; \
@NATIVE_TRUE@ GOOS=`$(abs_builddir)/go$(EXEEXT) env GOOS`; \
@NATIVE_TRUE@ files=`$(SHELL) $(libgosrcdir)/../match.sh --goarch=$${GOARCH} --goos=$${GOOS} --srcdir=$(libgosrcdir)/runtime --extrafiles="$(libgodir)/runtime_sysinfo.go $(libgodir)/sigtab.go" --tag=libffi`; \
@@ -970,10 +948,11 @@ mostlyclean-local:
# check-vet runs `go test cmd/vet` in our environment.
@NATIVE_TRUE@check-vet: go$(EXEEXT) $(noinst_PROGRAMS) check-head check-gccgo check-gcc
@NATIVE_TRUE@ rm -rf check-vet-dir cmd_vet-testlog
-@NATIVE_TRUE@ $(MKDIR_P) check-vet-dir/src/cmd/internal
+@NATIVE_TRUE@ $(MKDIR_P) check-vet-dir/src/cmd/internal check-vet-dir/src/cmd/vendor/golang.org/x
@NATIVE_TRUE@ cp -r $(cmdsrcdir)/vet check-vet-dir/src/cmd/
@NATIVE_TRUE@ cp -r $(cmdsrcdir)/internal/objabi check-vet-dir/src/cmd/internal
@NATIVE_TRUE@ cp $(libgodir)/objabi.go check-vet-dir/src/cmd/internal/objabi/
+@NATIVE_TRUE@ cp -r $(libgosrcdir)/golang.org/x/tools check-vet-dir/src/cmd/vendor/golang.org/x/
@NATIVE_TRUE@ @abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \
@NATIVE_TRUE@ abs_checkdir=`cd check-vet-dir && $(PWD_COMMAND)`; \
@NATIVE_TRUE@ echo "cd check-vet-dir/src/cmd/vet && $(ECHO_ENV) GOPATH=$${abs_checkdir} $(abs_builddir)/go$(EXEEXT) test -test.short -test.timeout=$(GOTOOLS_TEST_TIMEOUT)s -test.v" > cmd_vet-testlog