Skip to content

Commit db3bb2b

Browse files
authored
Merge pull request #527 from ewasm/ci
ci: Only build EVMC vmtester (no unit tests)
2 parents 408aa44 + 2e1ef52 commit db3bb2b

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.8)
22

3-
if (NOT EXISTS ${CMAKE_SOURCE_DIR}/evmc/.git OR NOT EXISTS ${CMAKE_SOURCE_DIR}/cmake/cable/.git)
3+
if(NOT EXISTS ${CMAKE_SOURCE_DIR}/evmc/.git OR NOT EXISTS ${CMAKE_SOURCE_DIR}/cmake/cable/.git)
44
message(FATAL_ERROR "Git submodules not initialized, execute:\n git submodule update --init")
55
endif()
66

@@ -12,8 +12,7 @@ include(CableToolchains)
1212
include(CMakePackageConfigHelpers)
1313
include(GNUInstallDirs)
1414

15-
option(EVMC_TESTING "Build EVMC tests and test tools" OFF)
16-
if(EVMC_TESTING)
15+
if(EVMC_TESTING OR EVMC_TEST_TOOLS)
1716
# If Hunter is needed it must be initialized before project(hera).
1817
include(evmc/cmake/cable/HunterGate.cmake)
1918
include(evmc/cmake/HunterConfig.cmake)

circle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ jobs:
191191
CC: clang
192192
GENERATOR: Ninja
193193
BUILD_PARALLEL_JOBS: 4
194-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=OFF -DHERA_BINARYEN=ON -DHERA_WAVM=ON -DHERA_WABT=ON -DEVMC_TESTING=ON
194+
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=OFF -DHERA_BINARYEN=ON -DHERA_WAVM=ON -DHERA_WABT=ON -DEVMC_TEST_TOOLS=ON
195195
docker:
196196
- image: ethereum/cpp-build-env:9
197197
steps:
@@ -219,7 +219,7 @@ jobs:
219219
CC: clang
220220
GENERATOR: Ninja
221221
BUILD_PARALLEL_JOBS: 4
222-
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=OFF -DHERA_BINARYEN=ON -DHERA_WAVM=ON -DHERA_WABT=ON -DEVMC_TESTING=ON -DSANITIZE=address
222+
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=OFF -DHERA_BINARYEN=ON -DHERA_WAVM=ON -DHERA_WABT=ON -DEVMC_TEST_TOOLS=ON -DSANITIZE=address
223223
# The ASan must the first loaded shared library. Force preloading it with this flag.
224224
PRELOAD_ASAN: true
225225
docker:

0 commit comments

Comments
 (0)