Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Strongerrunner #12647

Merged
merged 8 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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: Integration tests
name: Library integration tests
on:
push:
branches:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/test-integration.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Integration tests
name: Erigon integration tests
on:
push:
branches:
Expand All @@ -24,6 +24,7 @@ jobs:
os:
- ubuntu-22.04
- macos-14
- ubuntu-latest-erigontests-large
runs-on: ${{ matrix.os }}

steps:
Expand All @@ -37,7 +38,7 @@ jobs:
run: sudo apt update && sudo apt install build-essential

- name: test-integration
run: make test-integration
run: GOGC=50 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) ./... -p 2
GOTEST = ${CPU_ARCH} CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPRIVATE="$(GOPRIVATE)" GODEBUG=cgocheck=0 GOTRACEBACK=1 $(GO) test $(GO_FLAGS) ./...

default: all

Expand Down
1 change: 1 addition & 0 deletions tests/block_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ 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
2 changes: 0 additions & 2 deletions tests/difficulty_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ import (
)

func TestDifficulty(t *testing.T) {
//t.Parallel()

dt := new(testMatcher)

dt.walk(t, difficultyTestDir, func(t *testing.T, name string, superTest map[string]json.RawMessage) {
Expand Down
1 change: 1 addition & 0 deletions tests/exec_spec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ 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
2 changes: 0 additions & 2 deletions tests/init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ func (tm *testMatcher) runTestFile(t *testing.T, path, name string, runTest inte
t.Skip("Skipped by whitelist")
}
}
//t.Parallel()

// Load the file as map[string]<testType>.
m := makeMapFromTestFunc(runTest)
Expand Down Expand Up @@ -289,7 +288,6 @@ func runTestFunc(runTest interface{}, t *testing.T, name string, m reflect.Value
}

func TestMatcherWhitelist(t *testing.T) {
//t.Parallel()
tm := new(testMatcher)
tm.whitelist("invalid*")
tm.walk(t, rlpTestDir, func(t *testing.T, name string, test *RLPTest) {
Expand Down
1 change: 0 additions & 1 deletion tests/rlp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
)

func TestRLP(t *testing.T) {
//t.Parallel()
tm := new(testMatcher)
tm.walk(t, rlpTestDir, func(t *testing.T, name string, test *RLPTest) {
if err := tm.checkFailure(t, test.Run()); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion tests/state_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ 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" {
t.Skip("fix me on win please") // it's too slow on win and stops on macos, need generally improve speed of this tests
}
//t.Parallel()

st := new(testMatcher)

Expand Down
3 changes: 1 addition & 2 deletions tests/transaction_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ import (
)

func TestTransaction(t *testing.T) {
//t.Parallel()

txt := new(testMatcher)

// We don't allow more than uint64 in gas amount
Expand All @@ -38,6 +36,7 @@ func TestTransaction(t *testing.T) {
txt.skipLoad("^ttGasLimit/TransactionWithGasLimitxPriceOverflow.json")

txt.walk(t, transactionTestDir, func(t *testing.T, name string, test *TransactionTest) {
t.Parallel()
cfg := params.MainnetChainConfig
if err := txt.checkFailure(t, test.Run(cfg.ChainID)); err != nil {
t.Error(err)
Expand Down
Loading