sql: skip pgbench if not on PATH

Currently blocking cockroachdb#8081

pkg/sql/pgbench_test.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"math/rand"
 	"net/url"
+	"os/exec"
 	"testing"
 	"time"
 
@@ -84,6 +85,9 @@ func runPgbenchQueryParallel(b *testing.B, db *gosql.DB) {
 }
 
 func execPgbench(b *testing.B, pgUrl url.URL) {
+	if _, err := exec.LookPath("pgbench"); err != nil {
+		b.Skip("pgbench is not available on PATH")
+	}
 	c, err := pgbench.SetupExec(pgUrl, "bench", 20000, b.N)
 	if err != nil {
 		b.Fatal(err)

pkg/sql/txn_restart_test.go

@@ -654,7 +654,7 @@ func (rs rollbackStrategy) SQLCommand() string {
 // errors.
 // This function needs to be called from tests that set
 // server.Context.TestingKnobs.ExecutorTestingKnobs.FixTxnPriority = true
-func exec(t *testing.T, sqlDB *gosql.DB, rs rollbackStrategy, fn func(*gosql.Tx) bool) {
+func retryExec(t *testing.T, sqlDB *gosql.DB, rs rollbackStrategy, fn func(*gosql.Tx) bool) {
 	tx, err := sqlDB.Begin()
 	if err != nil {
 		t.Fatal(err)
@@ -775,7 +775,7 @@ CREATE TABLE t.test (k INT PRIMARY KEY, v TEXT);
 
 			commitCount := s.MustGetSQLCounter(sql.MetaTxnCommit.Name)
 			// This is the magic. Run the txn closure until all the retries are exhausted.
-			exec(t, sqlDB, rs, func(tx *gosql.Tx) bool {
+			retryExec(t, sqlDB, rs, func(tx *gosql.Tx) bool {
 				return runTestTxn(t, tc.magicVals, tc.expectedErr, sqlDB, tx, sentinelInsert)
 			})
 			checkRestarts(t, tc.magicVals)