Skip to content

Commit

Permalink
revert changes (#12649)
Browse files Browse the repository at this point in the history
Revert parallel test execution cause gitlab runner is not strong enough
(#12644)
  • Loading branch information
dvovk authored Nov 6, 2024
1 parent 0631472 commit 82af954
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-erigon-is-library.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Library integration tests
name: Integration tests
on:
push:
branches:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test-integration.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Erigon integration tests
name: Integration tests
on:
push:
branches:
Expand All @@ -24,7 +24,6 @@ jobs:
os:
- ubuntu-22.04
- macos-14
- ubuntu-latest-erigontests-large
runs-on: ${{ matrix.os }}

steps:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion tests/block_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion tests/exec_spec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion tests/state_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down

0 comments on commit 82af954

Please sign in to comment.