diff --git a/Makefile b/Makefile index 62bf5d05b..4c3618e80 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,7 @@ test: # cargo test --all -- --test-threads=1 $(runargs) # cargo test --all --exclude wasmer-emscripten -- --test-threads=1 $(runargs) cargo test -p wasmer-spectests -- --test-threads=1 $(runargs) + cargo build -p wasmer-runtime-c-api cargo test -p wasmer-runtime-c-api -- --nocapture release: diff --git a/lib/runtime-c-api/tests/CMakeLists.txt b/lib/runtime-c-api/tests/CMakeLists.txt index ea9cfd84e..b8ad14445 100644 --- a/lib/runtime-c-api/tests/CMakeLists.txt +++ b/lib/runtime-c-api/tests/CMakeLists.txt @@ -4,21 +4,6 @@ project (WasmerCApiTests) add_executable(test-instantiate test-instantiate.c) add_executable(test-import-function test-import-function.c) -include(ExternalProject) -set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/rust-build) -ExternalProject_Add( - wasmer-runtime-c-api - DOWNLOAD_COMMAND "" - CONFIGURE_COMMAND "" - BUILD_COMMAND cargo build - COMMAND cargo build - BINARY_DIR "${CMAKE_SOURCE_DIR}/../" - INSTALL_COMMAND "" - LOG_BUILD ON) -add_dependencies(test-instantiate wasmer-runtime-c-api) -add_dependencies(test-import-function wasmer-runtime-c-api) - - find_library( WASMER_LIB NAMES libwasmer_runtime_c_api.dylib libwasmer_runtime_c_api.so libwasmer_runtime_c_api.dll PATHS ${CMAKE_SOURCE_DIR}/../../../target/debug/