Skip to content

Commit

Permalink
Makefile, README: enable GenesisTestsFiller sanitation
Browse files Browse the repository at this point in the history
  • Loading branch information
Everett Hildenbrandt committed Jun 6, 2018
1 parent 48d0d20 commit 67deb5a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,18 @@ tx_tests:=$(wildcard TransactionTests/*)
gs_tests:=$(filter-out %stEWASMTests, $(wildcard GeneralStateTests/*))
bc_tests:=$(wildcard BlockchainTests/*)
vm_tests:=$(wildcard VMTests/*)
all_tests:=$(gs_tests) $(bc_tests) $(vm_tests)

tx_fillers:=$(wildcard src/TransactionTestsFiller/*)
gs_fillers:=$(wildcard src/GeneralStateTestsFiller/*)
bc_fillers:=$(wildcard src/BlockchainTestsFiller/*)
vm_fillers:=$(filter-out %.sol %.md, $(wildcard src/VMTestsFiller/*))
all_fillers:=$(gs_fillers) $(bc_fillers) $(vm_fillers)
gen_fillers:=$(wildcard src/GenesisTestsFiller/*)

all_schemas:=$(wildcard JSONSchema/*.json)

# Testset sanitation

sani: sani-schema sani-vm sani-gs sani-tx sani-bc
sani: sani-schema sani-vm sani-gs sani-tx sani-bc sani-gen

sani-schema: $(all_schemas:=.format)

Expand All @@ -36,6 +35,11 @@ sani-tx: $(tx_tests:=.filled)
# TODO: enable $(bc_tests:=.format) $(bc_fillers:=.format) $(bc_tests:=.filled)
sani-bc: $(bc_tests:=.valid) $(bc_fillers:=.valid)

# TODO: enable $(gen_tests:=.format) $(gen_tests:=.valid) $(gen_tests:=.filled)
sani-gen: $(gen_fillers:=.format) \
$(gen_fillers:=.valid) \
$(gen_fillers:=.filled)

%.format:
python3 test.py format ./$*
git diff --quiet --exit-code &>/dev/null
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ See the `TODO`s in the `Makefile` to see which checkers are enabled for which te
- `gs`: GeneralStateTests and GeneralStateTestsFiller
- `bc`: BlockchainTests and BlockchainTestsFiller
- `tx`: TransactionTests and TransactionTestsFiller
- `gen`: GenesisTestsFiller

### Runners/Fillers

Expand Down

0 comments on commit 67deb5a

Please sign in to comment.