Skip to content

Commit 5983bd7

Browse files
authored
ci: Take EOF state tests from ipsilon fork (#651)
Modify the CI config and extract the EOF execution tests step. Download EOF state tests from https://github.com/ipsilon/tests branch `eof`. This allows to shorten develop-test loop by delaying the tests upstream step.
1 parent d63fa8b commit 5983bd7

File tree

1 file changed

+26
-3
lines changed

1 file changed

+26
-3
lines changed

circle.yml

+26-3
Original file line numberDiff line numberDiff line change
@@ -137,21 +137,35 @@ commands:
137137

138138
download_execution_tests:
139139
parameters:
140+
repo:
141+
type: string
142+
default: "ethereum/tests"
140143
rev:
141144
type: string
142145
default: develop
143146
commit:
144147
type: string
145148
default: ""
149+
legacy:
150+
description: "Download also legacy tests"
151+
type: boolean
152+
default: true
146153
steps:
147154
- run:
148155
name: "Download execution tests: <<parameters.rev>> <<parameters.commit>>"
149156
working_directory: ~/tests
150157
command: |
151-
git clone --no-checkout --depth=250 --single-branch https://github.com/ethereum/tests . --branch <<parameters.rev>>
158+
find . -delete
159+
git clone --no-checkout --depth=100 --single-branch https://github.com/<<parameters.repo>> . --branch <<parameters.rev>>
152160
<<#parameters.rev>>git checkout <<parameters.rev>><</parameters.rev>>
153161
<<#parameters.commit>>git checkout <<parameters.commit>><</parameters.commit>>
154-
git submodule update --init --recursive --depth=1 --progress
162+
- when:
163+
condition: <<parameters.legacy>>
164+
steps:
165+
- run:
166+
name: "Download legacy execution tests (git submodule)"
167+
working_directory: ~/tests
168+
command: git submodule update --init --recursive --depth=1 --progress
155169

156170
build:
157171
description: "Build"
@@ -436,7 +450,16 @@ jobs:
436450
working_directory: ~/build
437451
command: |
438452
export EVMONE_PRECOMPILES_STUB=~/project/test/state/precompiles_stub.json
439-
bin/evmone-statetest ~/tests/GeneralStateTests ~/tests/EIPTests/StateTests/stEOF ~/tests/LegacyTests/Constantinople/GeneralStateTests
453+
bin/evmone-statetest ~/tests/GeneralStateTests ~/tests/LegacyTests/Constantinople/GeneralStateTests
454+
- download_execution_tests:
455+
repo: ipsilon/tests
456+
rev: eof
457+
legacy: false
458+
- run:
459+
name: "State tests (EOF)"
460+
working_directory: ~/build
461+
command: |
462+
bin/evmone-statetest ~/tests/EIPTests/StateTests/stEOF
440463
- collect_coverage_gcc
441464
- upload_coverage:
442465
flags: statetests

0 commit comments

Comments
 (0)