From 82af95424f3b699de4a889428c7be5ab1c6e2e55 Mon Sep 17 00:00:00 2001 From: Dmytro Vovk Date: Wed, 6 Nov 2024 12:05:30 +0000 Subject: [PATCH] revert changes (#12649) Revert parallel test execution cause gitlab runner is not strong enough (https://github.com/erigontech/erigon/issues/12644) --- .github/workflows/test-erigon-is-library.yml | 2 +- .github/workflows/test-integration.yml | 5 ++--- Makefile | 2 +- tests/block_test.go | 1 - tests/exec_spec_test.go | 1 - tests/state_test.go | 1 - 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-erigon-is-library.yml b/.github/workflows/test-erigon-is-library.yml index 50a20f0e224..e165dca93b7 100644 --- a/.github/workflows/test-erigon-is-library.yml +++ b/.github/workflows/test-erigon-is-library.yml @@ -1,4 +1,4 @@ -name: Library integration tests +name: Integration tests on: push: branches: diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index b90dff0d477..c7462a8d262 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -1,4 +1,4 @@ -name: Erigon integration tests +name: Integration tests on: push: branches: @@ -24,7 +24,6 @@ jobs: os: - ubuntu-22.04 - macos-14 - - ubuntu-latest-erigontests-large runs-on: ${{ matrix.os }} steps: @@ -38,7 +37,7 @@ jobs: run: sudo apt update && sudo apt install build-essential - name: test-integration - run: GOGC=50 make test-integration + run: make test-integration tests-windows: strategy: diff --git a/Makefile b/Makefile index 55e035f8362..aab922d9e06 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ GO_FLAGS += -ldflags "-X ${PACKAGE}/params.GitCommit=${GIT_COMMIT} -X ${PACKAGE} GOBUILD = ${CPU_ARCH} CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPRIVATE="$(GOPRIVATE)" $(GO) build $(GO_FLAGS) GO_DBG_BUILD = ${CPU_ARCH} CGO_CFLAGS="$(CGO_CFLAGS) -DMDBX_DEBUG=1" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPRIVATE="$(GOPRIVATE)" $(GO) build -tags $(BUILD_TAGS),debug -gcflags=all="-N -l" # see delve docs -GOTEST = ${CPU_ARCH} CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPRIVATE="$(GOPRIVATE)" GODEBUG=cgocheck=0 GOTRACEBACK=1 $(GO) test $(GO_FLAGS) ./... +GOTEST = ${CPU_ARCH} CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPRIVATE="$(GOPRIVATE)" GODEBUG=cgocheck=0 GOTRACEBACK=1 $(GO) test $(GO_FLAGS) ./... -p 2 default: all diff --git a/tests/block_test.go b/tests/block_test.go index 3003fd707a0..269dde4ab78 100644 --- a/tests/block_test.go +++ b/tests/block_test.go @@ -53,7 +53,6 @@ func TestBlockchain(t *testing.T) { checkStateRoot := true bt.walk(t, blockTestDir, func(t *testing.T, name string, test *BlockTest) { - t.Parallel() // import pre accounts & construct test genesis block & state root if err := bt.checkFailure(t, test.Run(t, checkStateRoot)); err != nil { t.Error(err) diff --git a/tests/exec_spec_test.go b/tests/exec_spec_test.go index e93e660f97b..d8ea375f79a 100644 --- a/tests/exec_spec_test.go +++ b/tests/exec_spec_test.go @@ -35,7 +35,6 @@ func TestExecutionSpec(t *testing.T) { checkStateRoot := true bt.walk(t, dir, func(t *testing.T, name string, test *BlockTest) { - t.Parallel() // import pre accounts & construct test genesis block & state root if err := bt.checkFailure(t, test.Run(t, checkStateRoot)); err != nil { t.Error(err) diff --git a/tests/state_test.go b/tests/state_test.go index 7199c444aac..9b308a99a57 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -39,7 +39,6 @@ import ( ) func TestState(t *testing.T) { - t.Parallel() defer log.Root().SetHandler(log.Root().GetHandler()) log.Root().SetHandler(log.LvlFilterHandler(log.LvlError, log.StderrHandler)) if runtime.GOOS == "windows" {