Skip to content

Commit a23f9af

Browse files
author
Bryan C. Mills
committed
cmd/go: convert TestCoverageUses*Mode* to script tests
Updates #28387 Updates #30316 Change-Id: I5a1a7870928083a98a76225c428ad4d7263fd832 Reviewed-on: https://go-review.googlesource.com/c/go/+/207610 Run-TryBot: Bryan C. Mills <[email protected]> Reviewed-by: Jay Conrod <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
1 parent 48989d5 commit a23f9af

File tree

2 files changed

+25
-51
lines changed

2 files changed

+25
-51
lines changed

src/cmd/go/go_test.go

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2376,57 +2376,6 @@ func TestCoverageDotImport(t *testing.T) {
23762376
checkCoverage(tg, data)
23772377
}
23782378

2379-
// Check that coverage analysis uses set mode.
2380-
// Also check that coverage profiles merge correctly.
2381-
func TestCoverageUsesSetMode(t *testing.T) {
2382-
skipIfGccgo(t, "gccgo has no cover tool")
2383-
tooSlow(t)
2384-
tg := testgo(t)
2385-
defer tg.cleanup()
2386-
tg.creatingTemp("testdata/cover.out")
2387-
tg.run("test", "-short", "-cover", "encoding/binary", "errors", "-coverprofile=testdata/cover.out")
2388-
data := tg.getStdout() + tg.getStderr()
2389-
if out, err := ioutil.ReadFile("testdata/cover.out"); err != nil {
2390-
t.Error(err)
2391-
} else {
2392-
if !bytes.Contains(out, []byte("mode: set")) {
2393-
t.Error("missing mode: set")
2394-
}
2395-
if !bytes.Contains(out, []byte("errors.go")) {
2396-
t.Error("missing errors.go")
2397-
}
2398-
if !bytes.Contains(out, []byte("binary.go")) {
2399-
t.Error("missing binary.go")
2400-
}
2401-
if bytes.Count(out, []byte("mode: set")) != 1 {
2402-
t.Error("too many mode: set")
2403-
}
2404-
}
2405-
checkCoverage(tg, data)
2406-
}
2407-
2408-
func TestCoverageUsesAtomicModeForRace(t *testing.T) {
2409-
tooSlow(t)
2410-
if !canRace {
2411-
t.Skip("skipping because race detector not supported")
2412-
}
2413-
skipIfGccgo(t, "gccgo has no cover tool")
2414-
2415-
tg := testgo(t)
2416-
defer tg.cleanup()
2417-
tg.creatingTemp("testdata/cover.out")
2418-
tg.run("test", "-short", "-race", "-cover", "encoding/binary", "-coverprofile=testdata/cover.out")
2419-
data := tg.getStdout() + tg.getStderr()
2420-
if out, err := ioutil.ReadFile("testdata/cover.out"); err != nil {
2421-
t.Error(err)
2422-
} else {
2423-
if !bytes.Contains(out, []byte("mode: atomic")) {
2424-
t.Error("missing mode: atomic")
2425-
}
2426-
}
2427-
checkCoverage(tg, data)
2428-
}
2429-
24302379
func TestCoverageSyncAtomicImport(t *testing.T) {
24312380
skipIfGccgo(t, "gccgo has no cover tool")
24322381
tooSlow(t)
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
env GO111MODULE=off
2+
3+
# Coverage analysis should use 'set' mode by default,
4+
# and should merge coverage profiles correctly.
5+
6+
[short] skip
7+
[gccgo] skip # gccgo has no cover tool
8+
9+
go test -short -cover encoding/binary errors -coverprofile=$WORK/cover.out
10+
! stderr '[^0-9]0\.0%'
11+
! stdout '[^0-9]0\.0%'
12+
13+
grep -count=1 '^mode: set$' $WORK/cover.out
14+
grep 'errors\.go' $WORK/cover.out
15+
grep 'binary\.go' $WORK/cover.out
16+
17+
[!race] stop
18+
19+
go test -short -race -cover encoding/binary errors -coverprofile=$WORK/cover.out
20+
! stderr '[^0-9]0\.0%'
21+
! stdout '[^0-9]0\.0%'
22+
23+
grep -count=1 '^mode: atomic$' $WORK/cover.out
24+
grep 'errors\.go' $WORK/cover.out
25+
grep 'binary\.go' $WORK/cover.out

0 commit comments

Comments
 (0)