tests: split up state test execution

tests/state_test.go

@@ -35,7 +35,24 @@ import (
 	"github.com/ethereum/go-ethereum/eth/tracers/logger"
 )
 
-func TestState(t *testing.T) {
+func TestStateCurrent(t *testing.T) {
+	testState(t, stateTestDir)
+}
+
+func TestStateLegacy(t *testing.T) {
+	// For Istanbul, older tests were moved into LegacyTests
+	testState(t, legacyStateTestDir)
+}
+
+func TestStateBenchmarks(t *testing.T) {
+	testState(t, benchmarksDir)
+}
+
+func TestStateFuture(t *testing.T) {
+	testState(t, filepath.Join(baseDir, "EIPTests", "StateTests"))
+}
+
+func testState(t *testing.T, dir string) {
 	t.Parallel()
 
 	st := new(testMatcher)
@@ -66,13 +83,6 @@ func TestState(t *testing.T) {
 	st.fails(`stEIP4844-blobtransactions/opcodeBlobhashOutOfRange.json`, "test has incorrect state root")
 	st.fails(`stEIP4844-blobtransactions/opcodeBlobhBounds.json`, "test has incorrect state root")
 
-	// For Istanbul, older tests were moved into LegacyTests
-	for _, dir := range []string{
-		filepath.Join(baseDir, "EIPTests", "StateTests"),
-		stateTestDir,
-		legacyStateTestDir,
-		benchmarksDir,
-	} {
 	st.walk(t, dir, func(t *testing.T, name string, test *StateTest) {
 		for _, subtest := range test.Subtests() {
 			subtest := subtest
@@ -97,7 +107,6 @@ func TestState(t *testing.T) {
 			})
 		}
 	})
-	}
 }
 
 // Transactions with gasLimit above this value will not get a VM trace on failure.