go_1_6, go_1_7: comment out testLoadFixed in a way recommended by vcunat. The test depends on specific timezone names, and the latest tzdata changed the naming. Upstream only agrees to fix the test in the 1.8 branch that has no stable releases yer

lol

Michael Raskin 9 years ago 5b1dad79 58107014

2 changed files

expand all

pkgs

development

compilers

1.6.nix

1.7.nix

pkgs/development/compilers/go/1.6.nix

··· 72 sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go 73 # Remove the coverage test as we have removed this utility 74 sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go 75 76 sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go 77 sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go

··· 72 sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go 73 # Remove the coverage test as we have removed this utility 74 sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go 75 + # Remove the timezone naming test 76 + sed -i '/TestLoadFixed/areturn' src/time/time_test.go 77 78 sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go 79 sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go

pkgs/development/compilers/go/1.7.nix

··· 66 sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go 67 # Remove the coverage test as we have removed this utility 68 sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go 69 70 sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go 71 sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go

··· 66 sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go 67 # Remove the coverage test as we have removed this utility 68 sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go 69 + # Remove the timezone naming test 70 + sed -i '/TestLoadFixed/areturn' src/time/time_test.go 71 72 sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go 73 sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go