Skip to content

Commit e33c0f2

Browse files
author
Bryan C. Mills
committed
go/packages: skip tests that link binaries in short mode
These tests together account for about 1s of running time on my workstation. I expect that they are even slower on platforms that require external linking, and likely more memory-intensive than most of the other tests. For golang/go#46764 Change-Id: Ic9607ac71bcfd617581c58cfffe3775e23cd3422 Reviewed-on: https://go-review.googlesource.com/c/tools/+/332351 Trust: Bryan C. Mills <[email protected]> Run-TryBot: Bryan C. Mills <[email protected]> gopls-CI: kokoro <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Rebecca Stambler <[email protected]>
1 parent 8e32e9f commit e33c0f2

File tree

3 files changed

+75
-70
lines changed

3 files changed

+75
-70
lines changed

go/packages/overlay_test.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const (
2727
)
2828

2929
func TestOverlayChangesPackageName(t *testing.T) {
30-
testAllOrModules(t, testOverlayChangesPackageName)
30+
testAllOrModulesParallel(t, testOverlayChangesPackageName)
3131
}
3232
func testOverlayChangesPackageName(t *testing.T, exporter packagestest.Exporter) {
3333
log.SetFlags(log.Lshortfile)
@@ -57,7 +57,7 @@ func testOverlayChangesPackageName(t *testing.T, exporter packagestest.Exporter)
5757
log.SetFlags(0)
5858
}
5959
func TestOverlayChangesBothPackageNames(t *testing.T) {
60-
testAllOrModules(t, testOverlayChangesBothPackageNames)
60+
testAllOrModulesParallel(t, testOverlayChangesBothPackageNames)
6161
}
6262
func testOverlayChangesBothPackageNames(t *testing.T, exporter packagestest.Exporter) {
6363
log.SetFlags(log.Lshortfile)
@@ -106,7 +106,7 @@ func testOverlayChangesBothPackageNames(t *testing.T, exporter packagestest.Expo
106106
log.SetFlags(0)
107107
}
108108
func TestOverlayChangesTestPackageName(t *testing.T) {
109-
testAllOrModules(t, testOverlayChangesTestPackageName)
109+
testAllOrModulesParallel(t, testOverlayChangesTestPackageName)
110110
}
111111
func testOverlayChangesTestPackageName(t *testing.T, exporter packagestest.Exporter) {
112112
testenv.NeedsGo1Point(t, 16)
@@ -163,7 +163,7 @@ func checkPkg(t *testing.T, p *packages.Package, id, name string, syntax int) bo
163163
}
164164

165165
func TestOverlayXTests(t *testing.T) {
166-
testAllOrModules(t, testOverlayXTests)
166+
testAllOrModulesParallel(t, testOverlayXTests)
167167
}
168168

169169
// This test checks the behavior of go/packages.Load with an overlaid
@@ -247,7 +247,7 @@ func TestHello(t *testing.T) {
247247
}
248248
}
249249

250-
func TestOverlay(t *testing.T) { testAllOrModules(t, testOverlay) }
250+
func TestOverlay(t *testing.T) { testAllOrModulesParallel(t, testOverlay) }
251251
func testOverlay(t *testing.T, exporter packagestest.Exporter) {
252252
exported := packagestest.Export(t, exporter, []packagestest.Module{{
253253
Name: "golang.org/fake",
@@ -315,7 +315,7 @@ func testOverlay(t *testing.T, exporter packagestest.Exporter) {
315315
}
316316
}
317317

318-
func TestOverlayDeps(t *testing.T) { testAllOrModules(t, testOverlayDeps) }
318+
func TestOverlayDeps(t *testing.T) { testAllOrModulesParallel(t, testOverlayDeps) }
319319
func testOverlayDeps(t *testing.T, exporter packagestest.Exporter) {
320320
exported := packagestest.Export(t, exporter, []packagestest.Module{{
321321
Name: "golang.org/fake",
@@ -364,7 +364,7 @@ func testOverlayDeps(t *testing.T, exporter packagestest.Exporter) {
364364

365365
}
366366

367-
func TestNewPackagesInOverlay(t *testing.T) { testAllOrModules(t, testNewPackagesInOverlay) }
367+
func TestNewPackagesInOverlay(t *testing.T) { testAllOrModulesParallel(t, testNewPackagesInOverlay) }
368368
func testNewPackagesInOverlay(t *testing.T, exporter packagestest.Exporter) {
369369
exported := packagestest.Export(t, exporter, []packagestest.Module{
370370
{
@@ -468,7 +468,7 @@ func testNewPackagesInOverlay(t *testing.T, exporter packagestest.Exporter) {
468468

469469
// Test that we can create a package and its test package in an overlay.
470470
func TestOverlayNewPackageAndTest(t *testing.T) {
471-
testAllOrModules(t, testOverlayNewPackageAndTest)
471+
testAllOrModulesParallel(t, testOverlayNewPackageAndTest)
472472
}
473473
func testOverlayNewPackageAndTest(t *testing.T, exporter packagestest.Exporter) {
474474
exported := packagestest.Export(t, exporter, []packagestest.Module{
@@ -651,7 +651,7 @@ func TestOverlayGOPATHVendoring(t *testing.T) {
651651
}
652652
}
653653

654-
func TestContainsOverlay(t *testing.T) { testAllOrModules(t, testContainsOverlay) }
654+
func TestContainsOverlay(t *testing.T) { testAllOrModulesParallel(t, testContainsOverlay) }
655655
func testContainsOverlay(t *testing.T, exporter packagestest.Exporter) {
656656
exported := packagestest.Export(t, exporter, []packagestest.Module{{
657657
Name: "golang.org/fake",
@@ -680,7 +680,7 @@ func testContainsOverlay(t *testing.T, exporter packagestest.Exporter) {
680680
}
681681
}
682682

683-
func TestContainsOverlayXTest(t *testing.T) { testAllOrModules(t, testContainsOverlayXTest) }
683+
func TestContainsOverlayXTest(t *testing.T) { testAllOrModulesParallel(t, testContainsOverlayXTest) }
684684
func testContainsOverlayXTest(t *testing.T, exporter packagestest.Exporter) {
685685
exported := packagestest.Export(t, exporter, []packagestest.Module{{
686686
Name: "golang.org/fake",
@@ -713,7 +713,7 @@ func testContainsOverlayXTest(t *testing.T, exporter packagestest.Exporter) {
713713
}
714714

715715
func TestInvalidFilesBeforeOverlay(t *testing.T) {
716-
testAllOrModules(t, testInvalidFilesBeforeOverlay)
716+
testAllOrModulesParallel(t, testInvalidFilesBeforeOverlay)
717717
}
718718

719719
func testInvalidFilesBeforeOverlay(t *testing.T, exporter packagestest.Exporter) {
@@ -753,7 +753,7 @@ func testInvalidFilesBeforeOverlay(t *testing.T, exporter packagestest.Exporter)
753753

754754
// Tests golang/go#35973, fixed in Go 1.14.
755755
func TestInvalidFilesBeforeOverlayContains(t *testing.T) {
756-
testAllOrModules(t, testInvalidFilesBeforeOverlayContains)
756+
testAllOrModulesParallel(t, testInvalidFilesBeforeOverlayContains)
757757
}
758758
func testInvalidFilesBeforeOverlayContains(t *testing.T, exporter packagestest.Exporter) {
759759
testenv.NeedsGo1Point(t, 15)
@@ -860,7 +860,7 @@ func isTestVariant(libID, testID string) bool {
860860
}
861861

862862
func TestInvalidXTestInGOPATH(t *testing.T) {
863-
testAllOrModules(t, testInvalidXTestInGOPATH)
863+
testAllOrModulesParallel(t, testInvalidXTestInGOPATH)
864864
}
865865
func testInvalidXTestInGOPATH(t *testing.T, exporter packagestest.Exporter) {
866866
t.Skip("Not fixed yet. See golang.org/issue/40825.")
@@ -893,7 +893,7 @@ func testInvalidXTestInGOPATH(t *testing.T, exporter packagestest.Exporter) {
893893

894894
// Reproduces golang/go#40685.
895895
func TestAddImportInOverlay(t *testing.T) {
896-
testAllOrModules(t, testAddImportInOverlay)
896+
testAllOrModulesParallel(t, testAddImportInOverlay)
897897
}
898898
func testAddImportInOverlay(t *testing.T, exporter packagestest.Exporter) {
899899
exported := packagestest.Export(t, exporter, []packagestest.Module{
@@ -962,7 +962,7 @@ func _() {
962962

963963
// Tests that overlays are applied for different kinds of load patterns.
964964
func TestLoadDifferentPatterns(t *testing.T) {
965-
testAllOrModules(t, testLoadDifferentPatterns)
965+
testAllOrModulesParallel(t, testLoadDifferentPatterns)
966966
}
967967
func testLoadDifferentPatterns(t *testing.T, exporter packagestest.Exporter) {
968968
exported := packagestest.Export(t, exporter, []packagestest.Module{

0 commit comments

Comments
 (0)