aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEverett Hildenbrandt <hildenb2@illinois.edu>2018-06-07 00:51:32 +0800
committerEverett Hildenbrandt <hildenb2@illinois.edu>2018-06-07 01:00:39 +0800
commit1a3c786a245a72333284ee525b405989008a9f32 (patch)
tree0f233a7f48687e2f34ab4a5323a138c010b883e7
parent1bf9d68c3a1397a6dab9501efa7fd787a4c370e9 (diff)
downloaddexon-tests-1a3c786a245a72333284ee525b405989008a9f32.tar
dexon-tests-1a3c786a245a72333284ee525b405989008a9f32.tar.gz
dexon-tests-1a3c786a245a72333284ee525b405989008a9f32.tar.bz2
dexon-tests-1a3c786a245a72333284ee525b405989008a9f32.tar.lz
dexon-tests-1a3c786a245a72333284ee525b405989008a9f32.tar.xz
dexon-tests-1a3c786a245a72333284ee525b405989008a9f32.tar.zst
dexon-tests-1a3c786a245a72333284ee525b405989008a9f32.zip
Makefile: enable sani-gs and disable stEWASMTests
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
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