File tree 2 files changed +2
-21
lines changed 2 files changed +2
-21
lines changed Original file line number Diff line number Diff line change @@ -1427,10 +1427,6 @@ func cmdbootstrap() {
1427
1427
xprintf ("Building packages and commands for target, %s/%s.\n " , goos , goarch )
1428
1428
}
1429
1429
targets := []string {"std" , "cmd" }
1430
- if goos == "js" && goarch == "wasm" {
1431
- // Skip the cmd tools for js/wasm. They're not usable.
1432
- targets = targets [:1 ]
1433
- }
1434
1430
goInstall (goBootstrap , targets ... )
1435
1431
checkNotStale (goBootstrap , targets ... )
1436
1432
checkNotStale (cmdGo , targets ... )
Original file line number Diff line number Diff line change @@ -162,11 +162,7 @@ func (t *tester) run() {
162
162
// Instead, we can just check that it is not stale, which may be less
163
163
// expensive (and is also more likely to catch bugs in the builder
164
164
// implementation).
165
- willTest := []string {"std" }
166
- if t .shouldTestCmd () {
167
- willTest = append (willTest , "cmd" )
168
- }
169
- checkNotStale ("go" , willTest ... )
165
+ checkNotStale ("go" , "std" , "cmd" )
170
166
}
171
167
}
172
168
@@ -490,10 +486,7 @@ func (t *tester) registerTests() {
490
486
if t .race {
491
487
cmd .Args = append (cmd .Args , "-tags=race" )
492
488
}
493
- cmd .Args = append (cmd .Args , "std" )
494
- if t .shouldTestCmd () {
495
- cmd .Args = append (cmd .Args , "cmd" )
496
- }
489
+ cmd .Args = append (cmd .Args , "std" , "cmd" )
497
490
cmd .Stderr = new (bytes.Buffer )
498
491
all , err := cmd .Output ()
499
492
if err != nil {
@@ -1682,14 +1675,6 @@ func (t *tester) shouldUsePrecompiledStdTest() bool {
1682
1675
return err == nil
1683
1676
}
1684
1677
1685
- func (t * tester ) shouldTestCmd () bool {
1686
- if goos == "js" && goarch == "wasm" {
1687
- // Issues 25911, 35220
1688
- return false
1689
- }
1690
- return true
1691
- }
1692
-
1693
1678
// prebuiltGoPackageTestBinary returns the path where we'd expect
1694
1679
// the pre-built go test binary to be on disk when dist test is run with
1695
1680
// a single argument.
You can’t perform that action at this time.
0 commit comments