OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: rename TestAddr6 to avoid gotest confusion 

On ppc64 gotest treats data variables whose names begin with "Test" as
    tests to run.  This is to support the function descriptors used for
    ppc64 ELF ABI v1.  This causes gotest to think that TestAddr6 is a
    test, when it is actually a variable.  For a simple fix until we can
    figure out how to write gotest properly, rename the variable.
    
    Fixes golang/go#23623
    
    Reviewed-on: https://go-review.googlesource.com/90995

From-SVN: r257235
This commit is contained in:
Ian Lance Taylor 2018-01-31 14:43:37 +00:00
parent 7a15726687
commit cb6a6b25e4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View File

@ -1,4 +1,4 @@
a347356d0f432cafb69f0cc5833d27663736a042
973ae0a30c17e736f57377fa32371719b9ebccf6
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

6
libgo/go/net/dnsclient_unix_test.go
View File

@ -27,7 +27,7 @@ var goResolver = Resolver{PreferGo: true}
const TestAddr uint32 = 0xc0000201
// Test address from 2001:db8::/32 block, reserved by RFC 3849 for documentation.
var TestAddr6 = [16]byte{0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}
var VarTestAddr6 = [16]byte{0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}
var dnsTransportFallbackTests = []struct {
server string
@ -506,7 +506,7 @@ func TestGoLookupIPWithResolverConfig(t *testing.T) {
Class: dnsClassINET,
Rdlength: 16,
},
AAAA: TestAddr6,
AAAA: VarTestAddr6,
})
}
}
@ -1230,7 +1230,7 @@ func TestStrictErrorsLookupIP(t *testing.T) {
Class: dnsClassINET,
Rdlength: 16,
},
AAAA: TestAddr6,
AAAA: VarTestAddr6,
},
}
default: