cmake: Use evmc-vmtester helper

ewasm · Jul 17, 2019 · bd71be0 · bd71be0
1 parent 98944df
commit bd71be0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,6 +64,7 @@ endif()
 
 add_subdirectory(evmc)
 add_subdirectory(src)
+enable_testing()
 add_subdirectory(test)
 
 

diff --git a/circle.yml b/circle.yml
@@ -163,8 +163,9 @@ defaults:
   evmc-test: &evmc-test
     run:
       name: "Run evmc tests"
+      working_directory: ~/build
       command: |
-        ~/build/evmc/test/evmc-vmtester ~/build/src/libhera.so
+        ctest
 
   evm2wasm-test: &evm2wasm-test
     run:

diff --git a/evmc b/evmc
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,3 +1,9 @@
+include(../evmc/cmake/EVMC.cmake)
+
+if(TARGET evmc::evmc-vmtester)
+    evmc_add_vm_test(NAME evmc-check TARGET hera)
+endif()
+
 if(HERA_FUZZING)
     add_subdirectory(fuzzing)
 endif()
+15 −5		.bumpversion.cfg
+30 −0		CHANGELOG.md
+4 −4		CMakeLists.txt
+2 −0		Cargo.toml
+10 −9		README.md
+15 −16		appveyor.yml
+3 −0		bindings/rust/evmc-declare-tests/.gitignore
+18 −0		bindings/rust/evmc-declare-tests/Cargo.toml
+28 −0		bindings/rust/evmc-declare-tests/src/lib.rs
+3 −0		bindings/rust/evmc-declare/.gitignore
+27 −0		bindings/rust/evmc-declare/Cargo.toml
+385 −0		bindings/rust/evmc-declare/src/lib.rs
+2 −2		bindings/rust/evmc-sys/Cargo.toml
+2 −0		bindings/rust/evmc-sys/build.rs
+27 −0		bindings/rust/evmc-sys/src/lib.rs
+2 −2		bindings/rust/evmc-vm/Cargo.toml
+148 −0		bindings/rust/evmc-vm/src/container.rs
+649 −67		bindings/rust/evmc-vm/src/lib.rs
+37 −0		bindings/rust/evmc-vm/src/types.rs
+112 −62		circle.yml
+3 −1		cmake/Config.cmake.in
+18 −0		cmake/EVMC.cmake
+3 −3		cmake/Hunter/init.cmake
+2 −2		cmake/cable/CableBuildType.cmake
+34 −16		cmake/cable/CableCompilerSettings.cmake
+75 −90		cmake/cable/HunterGate.cmake
+11 −24		cmake/cable/bootstrap.cmake
+2 −0		docs/EVMC.md
+7 −0		docs/VM_Guide.md
+3 −1		examples/CMakeLists.txt
+4 −2		examples/example-rust-vm/Cargo.toml
+24 −51		examples/example-rust-vm/src/lib.rs
+8 −0		examples/example_precompiles_vm/CMakeLists.txt
+127 −0		examples/example_precompiles_vm/example_precompiles_vm.cpp
+2 −11		examples/example_vm.c
+7 −0		examples/use_evmc_in_cmake/CMakeLists.txt
+72 −40		include/evmc/evmc.h
+44 −7		include/evmc/evmc.hpp
+5 −2		include/evmc/helpers.h
+36 −12		include/evmc/helpers.hpp
+64 −13		include/evmc/loader.h
+122 −16		lib/loader/loader.c
+16 −14		test/integration/cmake_package/CMakeLists.txt
+5 −0		test/integration/compilation/compilation_test.c
+10 −0		test/integration/compilation/compilation_test.cxx
+1 −1		test/unittests/CMakeLists.txt
+64 −1		test/unittests/test_cpp.cpp
+27 −2		test/unittests/test_helpers.cpp
+9 −9		test/unittests/test_instructions.cpp
+407 −32		test/unittests/test_loader.cpp
+22 −17		test/vmtester/CMakeLists.txt
+65 −18		test/vmtester/tests.cpp
+16 −14		test/vmtester/vmtester.cpp
+1 −1		test/vmtester/vmtester.hpp