Add support for ARM64 binaries on Linux and macOS

testserver/README.md

@@ -1,8 +1,8 @@
 # cockroach-go Testserver
 
 The `testserver` package helps running cockroachDB binary with tests. It 
-automatically downloads the latest stable cockroach binary for your runtimeOS 
-(Linux-amd64 and Darwin-amd64 only for now), or attempts to run "cockroach" from your PATH.
+automatically downloads the latest stable cockroach binary for your runtimeOS,
+or attempts to run "cockroach" from your PATH.
 
 ### Example
 To run the test server, call `NewTestServer(opts)` and with test server options. 
@@ -63,4 +63,4 @@ NewTestServer()`.
 
 ### Test Server for Multi Tenants
 The usage of test server as a tenant server is still under development. Please 
-check `testserver/tenant.go` for more information.
+check `testserver/tenant.go` for more information.

testserver/binaries.go

@@ -46,8 +46,8 @@ const (
 )
 
 const (
-	linuxUrlpat  = "https://binaries.cockroachdb.com/cockroach-v%s.linux-amd64.tgz"
-	macUrlpat    = "https://binaries.cockroachdb.com/cockroach-v%s.darwin-10.9-amd64.tgz"
+	linuxUrlpat  = "https://binaries.cockroachdb.com/cockroach-v%s.linux-%s.tgz"
+	macUrlpat    = "https://binaries.cockroachdb.com/cockroach-v%s.darwin-%s-%s.tgz"
 	winUrlpat    = "https://binaries.cockroachdb.com/cockroach-v%s.windows-6.2-amd64.zip"
 	sourceUrlPat = "https://binaries.cockroachdb.com/cockroach-v%s.src.tgz)"
 )
@@ -266,9 +266,14 @@ func getLatestStableVersionInfo() (string, string, error) {
 func getDownloadUrlForVersion(version string) string {
 	switch runtime.GOOS {
 	case "linux":
-		return fmt.Sprintf(linuxUrlpat, version)
+		return fmt.Sprintf(linuxUrlpat, version, runtime.GOARCH)
 	case "darwin":
-		return fmt.Sprintf(macUrlpat, version)
+		switch runtime.GOARCH {
+		case "arm64":
+			return fmt.Sprintf(macUrlpat, version, "11.0", runtime.GOARCH)
+		case "amd64":
+			return fmt.Sprintf(macUrlpat, version, "10.9", runtime.GOARCH)
+		}
 	case "windows":
 		return fmt.Sprintf(winUrlpat, version)
 	}

testserver/testserver.go

@@ -13,9 +13,8 @@
 // permissions and limitations under the License.
 
 // Package testserver provides helpers to run a cockroach binary within tests.
-// It automatically downloads the latest cockroach binary for your platform
-// (Linux-amd64 and Darwin-amd64 only for now), or attempts to run "cockroach"
-// from your PATH.
+// It automatically downloads the latest cockroach binary for your platform,
+// or attempts to run "cockroach" from your PATH.
 //
 // To use, run as follows:
 //