From 1a3c786a245a72333284ee525b405989008a9f32 Mon Sep 17 00:00:00 2001 From: Everett Hildenbrandt Date: Wed, 6 Jun 2018 10:51:32 -0600 Subject: Makefile: enable sani-gs and disable stEWASMTests --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c0ebb2131..91143bd68 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,9 @@ ETHEREUM_TEST_PATH=$(CURDIR) export ETHEREUM_TEST_PATH +# TODO: stop stripping out stEWASMTests from gs_tests tx_tests:=$(wildcard TransactionTests/*) -gs_tests:=$(wildcard GeneralStateTests/*) +gs_tests:=$(filter-out %stEWASMTests, $(wildcard GeneralStateTests/*)) bc_tests:=$(wildcard BlockchainTests/*) vm_tests:=$(wildcard VMTests/*) all_tests:=$(gs_tests) $(bc_tests) $(vm_tests) @@ -17,7 +18,7 @@ all_schemas:=$(wildcard JSONSchema/*.json) # Testset sanitation -sani: sani-schema sani-vm +sani: sani-schema sani-vm sani-gs sani-schema: $(all_schemas:=.format) @@ -25,6 +26,10 @@ sani-vm: $(vm_tests:=.format) $(vm_fillers:=.format) \ $(vm_tests:=.valid) $(vm_fillers:=.valid) \ $(vm_tests:=.filled) +# TODO: enable $(gs_fillers:=.valid) $(gs_tests:=.format) $(gs_fillers:=.format) +sani-gs: $(gs_tests:=.valid) \ + $(gs_tests:=.filled) + %.format: python3 test.py format ./$* git diff --quiet --exit-code &>/dev/null -- cgit v1.2.3