@@ -27,22 +27,19 @@ var slowBotAliases = map[string]string{
27
27
// Known missing builders:
28
28
"openbsd-arm" : "" ,
29
29
"openbsd-arm64" : "" ,
30
- "nacl-arm" : "" ,
31
30
"darwin-arm" : "" , // TODO(golang.org/issue/37611): Remove once port is removed.
32
31
"darwin-arm64" : "" , // TODO(golang.org/issue/39782): Add builder for darwin/arm64.
33
32
34
33
"386" : "linux-386" ,
35
34
"aix" : "aix-ppc64" ,
36
35
"amd64" : "linux-amd64" ,
37
- "amd64p32" : "nacl-amd64p32" ,
38
36
"android" : "android-amd64-emu" ,
39
37
"android-386" : "android-386-emu" ,
40
38
"android-amd64" : "android-amd64-emu" ,
41
39
"android-arm" : "android-arm-corellium" ,
42
40
"android-arm64" : "android-arm64-corellium" ,
43
41
"arm" : "linux-arm" ,
44
42
"arm64" : "linux-arm64-packet" ,
45
- "arm64p32" : "nacl-amd64p32" ,
46
43
"darwin" : "darwin-amd64-10_14" ,
47
44
"darwin-386" : "darwin-386-10_14" , // TODO(golang.org/issue/37610): Remove when Go 1.14 is no longer supported.
48
45
"darwin-amd64" : "darwin-amd64-10_14" ,
@@ -73,9 +70,6 @@ var slowBotAliases = map[string]string{
73
70
"mips64" : "linux-mips64-rtrk" ,
74
71
"mips64le" : "linux-mips64le-mengzhuo" ,
75
72
"mipsle" : "linux-mipsle-rtrk" ,
76
- "nacl" : "nacl-amd64p32" ,
77
- "nacl-387" : "nacl-386" ,
78
- "nacl-arm64p32" : "nacl-amd64p32" ,
79
73
"netbsd" : "netbsd-amd64-9_0" ,
80
74
"netbsd-386" : "netbsd-386-9_0" ,
81
75
"netbsd-amd64" : "netbsd-amd64-9_0" ,
@@ -157,12 +151,6 @@ var Hosts = map[string]*HostConfig{
157
151
Notes : "for localhost development of buildlets/gomote/coordinator only" ,
158
152
SSHUsername : os .Getenv ("USER" ),
159
153
},
160
- "host-nacl" : & HostConfig {
161
- Notes : "Container with Native Client binaries." ,
162
- ContainerImage : "linux-x86-nacl:latest" ,
163
- buildletURLTmpl : "http://storage.googleapis.com/$BUCKET/buildlet.linux-amd64" ,
164
- env : []string {"GOROOT_BOOTSTRAP=/go1.4" },
165
- },
166
154
"host-js-wasm" : & HostConfig {
167
155
Notes : "Container with node.js for testing js/wasm." ,
168
156
ContainerImage : "js-wasm:latest" ,
@@ -1060,9 +1048,6 @@ func (c *BuildConfig) AllScript() string {
1060
1048
if strings .HasPrefix (c .Name , "plan9-" ) {
1061
1049
return "src/all.rc"
1062
1050
}
1063
- if strings .HasPrefix (c .Name , "nacl-" ) {
1064
- return "src/nacltest.bash"
1065
- }
1066
1051
if strings .HasPrefix (c .Name , "misc-compile" ) {
1067
1052
return "src/buildall.bash"
1068
1053
}
@@ -1079,8 +1064,7 @@ func (c *BuildConfig) SplitMakeRun() bool {
1079
1064
switch c .AllScript () {
1080
1065
case "src/all.bash" , "src/all.bat" ,
1081
1066
"src/race.bash" , "src/race.bat" ,
1082
- "src/all.rc" ,
1083
- "src/nacltest.bash" :
1067
+ "src/all.rc" :
1084
1068
// These we've verified to work.
1085
1069
return true
1086
1070
}
@@ -1254,9 +1238,6 @@ func (c *BuildConfig) MakeScript() string {
1254
1238
if strings .HasPrefix (c .Name , "plan9-" ) {
1255
1239
return "src/make.rc"
1256
1240
}
1257
- if strings .HasPrefix (c .Name , "nacl-" ) {
1258
- return "src/naclmake.bash"
1259
- }
1260
1241
return "src/make.bash"
1261
1242
}
1262
1243
@@ -1814,29 +1795,6 @@ func init() {
1814
1795
return run
1815
1796
},
1816
1797
})
1817
- addBuilder (BuildConfig {
1818
- Name : "nacl-386" ,
1819
- HostType : "host-nacl" ,
1820
- buildsRepo : func (repo , branch , goBranch string ) bool {
1821
- // nacl support is removed in Go 1.14.
1822
- // TODO: Remove builder after Go 1.15 is out.
1823
- return repo == "go" && ! atLeastGo1 (goBranch , 14 ) && ! strings .HasPrefix (goBranch , "dev." )
1824
- },
1825
- numTryTestHelpers : 3 ,
1826
- env : []string {"GOOS=nacl" , "GOARCH=386" , "GOHOSTOS=linux" , "GOHOSTARCH=amd64" },
1827
- })
1828
- addBuilder (BuildConfig {
1829
- Name : "nacl-amd64p32" ,
1830
- HostType : "host-nacl" ,
1831
- buildsRepo : func (repo , branch , goBranch string ) bool {
1832
- // nacl support is removed in Go 1.14.
1833
- // TODO: Remove builder after Go 1.15 is out.
1834
- return repo == "go" && ! atLeastGo1 (goBranch , 14 ) && ! strings .HasPrefix (goBranch , "dev." )
1835
- },
1836
- tryBot : explicitTrySet ("go" ),
1837
- numTryTestHelpers : 3 ,
1838
- env : []string {"GOOS=nacl" , "GOARCH=amd64p32" , "GOHOSTOS=linux" , "GOHOSTARCH=amd64" },
1839
- })
1840
1798
addBuilder (BuildConfig {
1841
1799
Name : "js-wasm" ,
1842
1800
HostType : "host-js-wasm" ,
0 commit comments