From bd71be0575d6b44c05e262a90e981948ce814c11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <chfast@gmail.com>
Date: Wed, 17 Jul 2019 14:36:58 +0200
Subject: [PATCH] cmake: Use evmc-vmtester helper

---
 CMakeLists.txt      | 1 +
 circle.yml          | 3 ++-
 evmc                | 2 +-
 test/CMakeLists.txt | 6 ++++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4930aa62..31dc9e289 100644
--- 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
index 61d890eb8..4d5453c27 100644
--- 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
index 14d70e447..2a2a7328d 160000
--- a/evmc
+++ b/evmc
@@ -1 +1 @@
-Subproject commit 14d70e4478788cc41a309f944ea7dd12ee8b6d4d
+Subproject commit 2a2a7328d9530e7584e7aab63e5c927a050810f5
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 312fe07bc..95e3f77a5 100644
--- 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()