diff options
| author | Robert Griesemer <gri@golang.org> | 2020-12-14 11:53:55 -0800 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2020-12-14 12:13:36 -0800 |
| commit | 91803a2df334ddfc9377ef4d07cc5f0eff51b6a2 (patch) | |
| tree | 277500790211cdab0ee3f12e1833efa44495afbc /src/cmd/compile/internal/types2/stdlib_test.go | |
| parent | a20021227e987a24d3dbac5118a9dee4d90a96ff (diff) | |
| parent | 89f38323faa57d3f7475016f778be69fcffbe9fb (diff) | |
| download | go-91803a2df334ddfc9377ef4d07cc5f0eff51b6a2.tar.gz go-91803a2df334ddfc9377ef4d07cc5f0eff51b6a2.zip | |
[dev.typeparams] merge: merge branch 'dev.regabi' into 'dev.typeparams'
The following files had merge conflicts and were merged manually:
src/cmd/compile/fmtmap_test.go
src/cmd/compile/internal/gc/noder.go
src/go/parser/error_test.go
test/assign.go
test/chan/perm.go
test/fixedbugs/issue22822.go
test/fixedbugs/issue4458.go
test/init.go
test/interface/explicit.go
test/map1.go
test/method2.go
The following files had manual changes to make tests pass:
test/run.go
test/used.go
src/cmd/compile/internal/types2/stdlib_test.go
Change-Id: Ia495aaaa80ce321ee4ec2a9105780fbe913dbd4c
Diffstat (limited to 'src/cmd/compile/internal/types2/stdlib_test.go')
| -rw-r--r-- | src/cmd/compile/internal/types2/stdlib_test.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cmd/compile/internal/types2/stdlib_test.go b/src/cmd/compile/internal/types2/stdlib_test.go index 89e49d84d6..ae573a4ec8 100644 --- a/src/cmd/compile/internal/types2/stdlib_test.go +++ b/src/cmd/compile/internal/types2/stdlib_test.go @@ -162,6 +162,7 @@ func TestStdTest(t *testing.T) { testTestDir(t, filepath.Join(runtime.GOROOT(), "test"), "cmplxdivide.go", // also needs file cmplxdivide1.go - ignore "directive.go", // tests compiler rejection of bad directive placement - ignore + "linkname2.go", // types2 doesn't check validity of //go:xxx directives ) } |