From 41ceed55d983db3298c45323fa002504b2b73953 Mon Sep 17 00:00:00 2001
From: Morgan Bazalgette <morgan@morganbaz.com>
Date: Tue, 26 Nov 2024 16:08:15 +0100
Subject: [PATCH] test: run long gnovm tests in parallel

---
 gnovm/pkg/gnolang/files_test.go | 54 ++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/gnovm/pkg/gnolang/files_test.go b/gnovm/pkg/gnolang/files_test.go
index f1bc87d21d8..f1ab9fd86bb 100644
--- a/gnovm/pkg/gnolang/files_test.go
+++ b/gnovm/pkg/gnolang/files_test.go
@@ -33,19 +33,26 @@ func (nopReader) Read(p []byte) (int, error) { return 0, io.EOF }
 //	fix a specific test:
 //		go test -run TestFiles/'^bin1.gno' -short -v -update-golden-tests .
 func TestFiles(t *testing.T) {
+	t.Parallel()
+
 	rootDir, err := filepath.Abs("../../../")
 	require.NoError(t, err)
 
-	opts := &test.TestOptions{
-		RootDir: rootDir,
-		Output:  io.Discard,
-		Error:   io.Discard,
-		Sync:    *withSync,
+	newOpts := func() *test.TestOptions {
+		o := &test.TestOptions{
+			RootDir: rootDir,
+			Output:  io.Discard,
+			Error:   io.Discard,
+			Sync:    *withSync,
+		}
+		o.BaseStore, o.TestStore = test.Store(
+			rootDir, true,
+			nopReader{}, o.WriterForStore(), io.Discard,
+		)
+		return o
 	}
-	opts.BaseStore, opts.TestStore = test.Store(
-		rootDir, true,
-		nopReader{}, opts.WriterForStore(), io.Discard,
-	)
+	// sharedOpts is used for all "short" tests.
+	sharedOpts := newOpts()
 
 	dir := "../../tests/"
 	fsys := os.DirFS(dir)
@@ -59,7 +66,8 @@ func TestFiles(t *testing.T) {
 			return nil
 		}
 		subTestName := path[len("files/"):]
-		if strings.HasSuffix(path, "_long.gno") && testing.Short() {
+		isLong := strings.HasSuffix(path, "_long.gno")
+		if isLong && testing.Short() {
 			t.Run(subTestName, func(t *testing.T) {
 				t.Skip("skipping in -short")
 			})
@@ -73,6 +81,12 @@ func TestFiles(t *testing.T) {
 
 		var criticalError error
 		t.Run(subTestName, func(t *testing.T) {
+			opts := sharedOpts
+			if isLong {
+				// Long tests are run in parallel, and with their own store.
+				t.Parallel()
+				opts = newOpts()
+			}
 			changed, err := opts.RunFiletest(path, content)
 			if err != nil {
 				t.Fatal(err.Error())
@@ -94,6 +108,8 @@ func TestFiles(t *testing.T) {
 
 // TestStdlibs tests all the standard library packages.
 func TestStdlibs(t *testing.T) {
+	t.Parallel()
+
 	rootDir, err := filepath.Abs("../../../")
 	require.NoError(t, err)
 
@@ -102,8 +118,8 @@ func TestStdlibs(t *testing.T) {
 	if testing.Verbose() {
 		out = os.Stdout
 	}
-	opts := test.NewTestOptions(rootDir, nopReader{}, out, out)
-	opts.Verbose = true
+	sharedOpts := test.NewTestOptions(rootDir, nopReader{}, out, out)
+	sharedOpts.Verbose = true
 
 	dir := "../../stdlibs/"
 	fsys := os.DirFS(dir)
@@ -118,12 +134,20 @@ func TestStdlibs(t *testing.T) {
 		fp := filepath.Join(dir, path)
 		memPkg := gnolang.ReadMemPackage(fp, path)
 		t.Run(strings.ReplaceAll(memPkg.Path, "/", "-"), func(t *testing.T) {
-			if testing.Short() {
-				switch memPkg.Path {
-				case "bytes", "strconv", "regexp/syntax":
+			opts := sharedOpts
+			switch memPkg.Path {
+			case "bytes", "strconv", "regexp/syntax":
+				if testing.Short() {
 					t.Skip("Skipped because of -short, and this stdlib is very long currently.")
+				} else {
+					t.Parallel()
+
+					// Long test; run in parallel at the end with own store.
+					opts = test.NewTestOptions(rootDir, nopReader{}, out, out)
+					opts.Verbose = true
 				}
 			}
+
 			err := test.Test(memPkg, "", opts)
 			if !testing.Verbose() {
 				t.Log(capture.String())