On Fri, Jan 10, 2020 at 5:40 AM Rainer Orth <r...@cebitec.uni-bielefeld.de>
wrote:
>
> > This libgo patch compiles examples in _test packages. Previously if
> > the only names defined by _test packages were examples, the gotest
> > script would emit an incorrect _testmain.go file. I worked around
> > that by marking the example_test.go files +build ignored. This CL
> > changes the gotest script to handle this case correctly, and removes
> > the now-unnecessary build tags. Bootstrapped and ran Go testsuite on
> > x86_64-pc-linux-gnu. Committed to mainline.
>
> this patch breaks quite a number of libgo tests on Solaris:
>
> FAIL: bufio
> /vol/gcc/src/hg/trunk/local/libgo/testsuite/gotest[541]: local: not found [No
> such file or directory]
Whoops, sorry. Fixed like so, tested and committed to mainline.
Ian
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE (revision 280109)
+++ gcc/go/gofrontend/MERGE (working copy)
@@ -1,4 +1,4 @@
-98c4c21b52afd6384f9364527bd7f5f9a1c752cf
+a69ad9c7d1b45edcf8062a07d3a3c9b6838c04f8
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
Index: libgo/testsuite/gotest
===================================================================
--- libgo/testsuite/gotest (revision 280109)
+++ libgo/testsuite/gotest (working copy)
@@ -538,8 +538,7 @@ symtogo() {
# Takes an example name and puts any output into the file example.txt.
# It strips comment markers but does not otherwise change the output.
exampleoutput() {
- local n=$(testname $1)
- local f
+ n=$(testname $1)
for f in $gofiles $xgofiles; do
if ! grep "^func $n(" $f >/dev/null 2>&1; then
continue
