fix bug

common/cmd/cmd.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/docker/docker/pkg/reexec"
 	cmap "github.com/orcaman/concurrent-map"
 )
 
@@ -69,19 +68,6 @@ func (c *Cmd) runCmd() {
 	}
 }
 
-func (c *Cmd) runApp() {
-	fmt.Println("cmd:", append([]string{c.name}, c.args...))
-	if atomic.CompareAndSwapUint64(&c.isRunning, 0, 1) {
-		c.cmd = &exec.Cmd{
-			Path:   reexec.Self(),
-			Args:   append([]string{c.name}, c.args...),
-			Stderr: c,
-			Stdout: c,
-		}
-		c.ErrChan <- c.cmd.Run()
-	}
-}
-
 // RunCmd parallel running when parallel is true.
 func (c *Cmd) RunCmd(parallel bool) {
 	if parallel {

common/cmd/cmd_app.go

@@ -3,11 +3,13 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"strings"
 	"sync/atomic"
 	"testing"
 	"time"
 
+	"github.com/docker/docker/pkg/reexec"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -16,6 +18,19 @@ func (c *Cmd) IsRunning() bool {
 	return atomic.LoadUint64(&c.isRunning) == 1
 }
 
+func (c *Cmd) runApp() {
+	fmt.Println("cmd:", append([]string{c.name}, c.args...))
+	if atomic.CompareAndSwapUint64(&c.isRunning, 0, 1) {
+		c.cmd = &exec.Cmd{
+			Path:   reexec.Self(),
+			Args:   append([]string{c.name}, c.args...),
+			Stderr: c,
+			Stdout: c,
+		}
+		c.ErrChan <- c.cmd.Run()
+	}
+}
+
 // RunApp exec's the current binary using name as argv[0] which will trigger the
 // reexec init function for that name (e.g. "geth-test" in cmd/geth/run_test.go)
 func (c *Cmd) RunApp(waitResult func() bool) {
@@ -31,6 +46,9 @@ func (c *Cmd) RunApp(waitResult func() bool) {
 
 // WaitExit wait util process exit.
 func (c *Cmd) WaitExit() {
+	if atomic.LoadUint64(&c.isRunning) == 0 {
+		return
+	}
 	// Wait all the check functions are finished, interrupt loop when appear error.
 	var err error
 	for err == nil && !c.checkFuncs.IsEmpty() {

tests/integration-test/contracts_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"math/big"
 	"testing"
+	"time"
 
 	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
 	"github.com/scroll-tech/go-ethereum/common"
@@ -20,6 +21,8 @@ var (
 
 func TestERC20(t *testing.T) {
 	base.RunL2Geth(t)
+	time.Sleep(time.Second * 3)
+
 	l2Cli, err := base.L2Client()
 	assert.Nil(t, err)