status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CI: use a release build for the test suite (#278) 

* CI: use a release build for the test suite

Makefile: the "testsuite" target is no longer needed

* rename EXTRA_NIM_PARAMS to NIMFLAGS
This commit is contained in:
Ștefan Talpalaru 2019-03-17 01:54:30 +01:00 committed by Jacek Sieka
parent a0368d4e03
commit 9f0c945336
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -28,7 +28,7 @@ build_script:
test_script: test_script:
- mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% V=0 - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% V=0
- build\nimbus.exe --help - build\nimbus.exe --help
- mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% V=0 test - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% V=0 NIMFLAGS="-d:release" test
- IF "%PLATFORM%" == "x64" mingw32-make -j2 test-reproducibility - IF "%PLATFORM%" == "x64" mingw32-make -j2 test-reproducibility
deploy: off deploy: off

3
.travis.yml
View File

@ -35,5 +35,6 @@ script:
- set -e # fail fast - set -e # fail fast
- make -j${NPROC} V=0 - make -j${NPROC} V=0
- ./build/nimbus --help - ./build/nimbus --help
- make -j${NPROC} V=0 test test-reproducibility - make -j${NPROC} V=0 NIMFLAGS="-d:release" test
- make -j${NPROC} V=0 test-reproducibility

13
Makefile
View File

@ -25,8 +25,9 @@ RUN_CMD_IN_ALL_REPOS = git submodule foreach --recursive --quiet 'echo -e "\n\e[
ENV_SCRIPT := "$(CURDIR)/env.sh" ENV_SCRIPT := "$(CURDIR)/env.sh"
# duplicated in "env.sh" to prepend NIM_DIR/bin to PATH # duplicated in "env.sh" to prepend NIM_DIR/bin to PATH
NIM_DIR := vendor/Nim NIM_DIR := vendor/Nim
# extra parameters for the Nim compiler #- extra parameters for the Nim compiler
NIM_PARAMS := $(EXTRA_NIM_PARAMS) #- NIMFLAGS should come from the environment or make's command line
NIM_PARAMS := $(NIMFLAGS)
# verbosity level # verbosity level
V := 1 V := 1
NIM_PARAMS := $(NIM_PARAMS) --verbosity:$(V) NIM_PARAMS := $(NIM_PARAMS) --verbosity:$(V)
@ -139,14 +140,10 @@ $(NIMBLE_DIR): | $(NIM_BINARY)
nimbus.nims: nimbus.nims:
ln -s nimbus.nimble $@ ln -s nimbus.nimble $@
# builds and runs the testsuite # builds and runs the test suite
testsuite: | build deps test: | build deps
$(ENV_SCRIPT) nim test $(NIM_PARAMS) nimbus.nims $(ENV_SCRIPT) nim test $(NIM_PARAMS) nimbus.nims
#- builds the tools, to make sure they're still compilable
#- builds and runs all tests
test: | testsuite
# primitive reproducibility test # primitive reproducibility test
test-reproducibility: test-reproducibility:
+ [ -e build/nimbus ] || $(MAKE) V=0 nimbus; \ + [ -e build/nimbus ] || $(MAKE) V=0 nimbus; \

2
README.md
View File

@ -138,7 +138,7 @@ make LOG_LEVEL=TRACE nimbus # log everything
- pass arbitrary parameters to the Nim compiler: - pass arbitrary parameters to the Nim compiler:
```bash ```bash
make EXTRA_NIM_PARAMS="-d:release" make NIMFLAGS="-d:release"
``` ```
- if you want to use SSH keys with GitHub: - if you want to use SSH keys with GitHub:

1
tests/all_tests.nim
View File

@ -23,3 +23,4 @@ import ./test_code_stream,
./test_op_memory, ./test_op_memory,
./test_op_misc, ./test_op_misc,
./test_state_db ./test_state_db