force benchmarks to run on testsuite

katydid · Jan 14, 2025 · a58d3ad · a58d3ad
1 parent 210f46e
commit a58d3ad
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ install:
 	go install ./...
 
 bench:
-	go test -test.v -test.run=XXX -test.bench=. ./...
+	TESTSUITE=MUST go test -test.v -test.run=XXX -test.bench=. ./...
 
 vet:
 	go vet ./gen/...

diff --git a/validator/auto/bench_test.go b/validator/auto/bench_test.go
@@ -23,8 +23,12 @@ import (
 )
 
 func BenchmarkSuite(b *testing.B) {
-	if err := testsuite.BenchSuiteExists(); err != nil {
-		b.Fatal(err)
+	exists, err := testsuite.BenchSuiteExists()
+	if !exists {
+		if err != nil {
+			b.Fatal(err)
+		}
+		b.Skip()
 	}
 	benches, err := testsuite.ReadBenchmarkSuite()
 	if err != nil {

diff --git a/validator/intern/bench_test.go b/validator/intern/bench_test.go
@@ -22,8 +22,12 @@ import (
 )
 
 func BenchmarkSuite(b *testing.B) {
-	if err := testsuite.BenchSuiteExists(); err != nil {
-		b.Fatal(err)
+	exists, err := testsuite.BenchSuiteExists()
+	if !exists {
+		if err != nil {
+			b.Fatal(err)
+		}
+		b.Skip()
 	}
 	benches, err := testsuite.ReadBenchmarkSuite()
 	if err != nil {

diff --git a/validator/interp/bench_test.go b/validator/interp/bench_test.go
@@ -22,8 +22,12 @@ import (
 )
 
 func BenchmarkSuite(b *testing.B) {
-	if err := testsuite.BenchSuiteExists(); err != nil {
-		b.Fatal(err)
+	exists, err := testsuite.BenchSuiteExists()
+	if !exists {
+		if err != nil {
+			b.Fatal(err)
+		}
+		b.Skip()
 	}
 	benches, err := testsuite.ReadBenchmarkSuite()
 	if err != nil {

diff --git a/validator/mem/bench_test.go b/validator/mem/bench_test.go
@@ -26,8 +26,12 @@ import (
 func BenchmarkSuite(b *testing.B) {
 	var bN = flag.Int("b.N", 0, "the number of times the benchmark function's target code must run")
 	flag.Parse()
-	if err := testsuite.BenchSuiteExists(); err != nil {
-		b.Fatal(err)
+	exists, err := testsuite.BenchSuiteExists()
+	if !exists {
+		if err != nil {
+			b.Fatal(err)
+		}
+		b.Skip()
 	}
 	benches, err := testsuite.ReadBenchmarkSuite()
 	if err != nil {

diff --git a/validator/testsuite/files.go b/validator/testsuite/files.go
@@ -55,11 +55,14 @@ func TestSuiteExists() (bool, error) {
 	return false, nil
 }
 
-func BenchSuiteExists() error {
+func BenchSuiteExists() (bool, error) {
 	if exists(testpath) {
-		return nil
+		return true, nil
+	}
+	if os.Getenv("TESTSUITE") == "MUST" {
+		return false, fmt.Errorf("testsuite does not exist at %v", testpath)
 	}
-	return fmt.Errorf("benchsuite does not exist at %v", testpath)
+	return false, fmt.Errorf("benchsuite does not exist at %v", testpath)
 }
 
 func getFolders(path string) (map[string][]string, error) {