more fix

Author: amsanghi

Diff for: .github/workflows/ci.yml

@@ -160,12 +160,12 @@ jobs:
         if: matrix.test-mode == 'defaults'
         run: |
           echo "Running redis tests" >> full.log
-          gotestsum --format short-verbose -- -p 1 -run TestRedis ./arbnode/... ./system_tests/... -coverprofile=coverage-redis.txt -covermode=atomic -coverpkg=./... --test_redis=redis://localhost:6379/0
+          gotestsum --format short-verbose -- -p 1 -run TestRedis ./arbnode/... ./system_tests/... -coverprofile=coverage-redis.txt -covermode=atomic -coverpkg=./... -- --test_redis=redis://localhost:6379/0
       
       - name: create block input json file
         if: matrix.test-mode == 'defaults'
         run: |
-          gotestsum --format short-verbose -- -run TestProgramStorage$ ./system_tests/... --count 1 --recordBlockInputs.WithBaseDir="${{ github.workspace }}/target" --recordBlockInputs.WithTimestampDirEnabled=false --recordBlockInputs.WithBlockIdInFileNameEnabled=false
+          gotestsum --format short-verbose -- -run TestProgramStorage$ ./system_tests/... --count 1 -- --recordBlockInputs.WithBaseDir="${{ github.workspace }}/target" --recordBlockInputs.WithTimestampDirEnabled=false --recordBlockInputs.WithBlockIdInFileNameEnabled=false
       
       - name: run arbitrator prover on block input json
         if: matrix.test-mode == 'defaults'

Diff for: .github/workflows/gotestsum.sh

@@ -79,7 +79,7 @@ for package in $packages; do
   fi
 
   if [ "$test_state_scheme" != "" ]; then
-      cmd="$cmd --test_state_scheme=$test_state_scheme"
+      cmd="$cmd -- --test_state_scheme=$test_state_scheme"
     fi
 
   cmd="$cmd > >(stdbuf -oL tee -a full.log | grep -vE \"INFO|seal\")"

Diff for: Makefile

@@ -240,7 +240,7 @@ test-go-stylus: test-go-deps
 
 .PHONY: test-go-redis
 test-go-redis: test-go-deps
-	gotestsum --format short-verbose --no-color=false -- -p 1 -run TestRedis ./system_tests/... ./arbnode/... --test_redis=redis://localhost:6379/0
+	gotestsum --format short-verbose --no-color=false -- -p 1 -run TestRedis ./system_tests/... ./arbnode/... -- --test_redis=redis://localhost:6379/0
 	@printf $(done)
 
 .PHONY: test-gen-proofs

Diff for: util/testhelpers/flag/flag.go

@@ -2,19 +2,41 @@ package testflag
 
 import (
 	"flag"
+	"log"
+	"os"
 )
 
 var (
-	StateSchemeFlag                               = flag.String("test_state_scheme", "", "State scheme to use for tests")
-	RedisFlag                                     = flag.String("test_redis", "", "Redis URL for testing")
-	RecordBlockInputsEnable                       = flag.Bool("recordBlockInputs.enable", true, "Whether to record block inputs as a json file")
-	RecordBlockInputsWithSlug                     = flag.String("recordBlockInputs.WithSlug", "", "Slug directory for validationInputsWriter")
-	RecordBlockInputsWithBaseDir                  = flag.String("recordBlockInputs.WithBaseDir", "", "Base directory for validationInputsWriter")
-	RecordBlockInputsWithTimestampDirEnabled      = flag.Bool("recordBlockInputs.WithTimestampDirEnabled", true, "Whether to add timestamp directory while recording block inputs")
-	RecordBlockInputsWithBlockIdInFileNameEnabled = flag.Bool("recordBlockInputs.WithBlockIdInFileNameEnabled", true, "Whether to record block inputs using test specific block_id")
-	LogLevelFlag                                  = flag.String("test_loglevel", "", "Log level for tests")
-	SeedFlag                                      = flag.String("seed", "", "Seed for random number generator")
-	RunsFlag                                      = flag.String("runs", "", "Number of runs for test")
-	LoggingFlag                                   = flag.String("logging", "", "Enable logging")
-	CompileFlag                                   = flag.String("test_compile", "", "[STORE|LOAD] to allow store/load in compile test")
+	fs                                            = flag.NewFlagSet("test", flag.ExitOnError)
+	StateSchemeFlag                               = fs.String("test_state_scheme", "", "State scheme to use for tests")
+	RedisFlag                                     = fs.String("test_redis", "", "Redis URL for testing")
+	RecordBlockInputsEnable                       = fs.Bool("recordBlockInputs.enable", true, "Whether to record block inputs as a json file")
+	RecordBlockInputsWithSlug                     = fs.String("recordBlockInputs.WithSlug", "", "Slug directory for validationInputsWriter")
+	RecordBlockInputsWithBaseDir                  = fs.String("recordBlockInputs.WithBaseDir", "", "Base directory for validationInputsWriter")
+	RecordBlockInputsWithTimestampDirEnabled      = fs.Bool("recordBlockInputs.WithTimestampDirEnabled", true, "Whether to add timestamp directory while recording block inputs")
+	RecordBlockInputsWithBlockIdInFileNameEnabled = fs.Bool("recordBlockInputs.WithBlockIdInFileNameEnabled", true, "Whether to record block inputs using test specific block_id")
+	LogLevelFlag                                  = fs.String("test_loglevel", "", "Log level for tests")
+	SeedFlag                                      = fs.String("seed", "", "Seed for random number generator")
+	RunsFlag                                      = fs.String("runs", "", "Number of runs for test")
+	LoggingFlag                                   = fs.String("logging", "", "Enable logging")
+	CompileFlag                                   = fs.String("test_compile", "", "[STORE|LOAD] to allow store/load in compile test")
 )
+
+// This is a workaround for the fact that we can only pass flags to the package in which they are defined.
+// So to avoid doing that we pass the flags after adding a delimiter "--" to the command line.
+// We then parse the argument only after the delimiter to the flagset.
+func init() {
+	var args []string
+	foundDelimiter := false
+	for _, arg := range os.Args {
+		if foundDelimiter {
+			args = append(args, arg)
+		}
+		if arg == "--" {
+			foundDelimiter = true
+		}
+	}
+	if err := fs.Parse(args); err != nil {
+		log.Fatal(err)
+	}
+}