diff --git a/lib/runtime-c-api/tests/.gitignore b/lib/runtime-c-api/tests/.gitignore index 15e33d2cf..7b8c0645b 100644 --- a/lib/runtime-c-api/tests/.gitignore +++ b/lib/runtime-c-api/tests/.gitignore @@ -9,15 +9,15 @@ install_manifest.txt compile_commands.json CTestTestfile.cmake _deps -test-globals +rust-build test-exports -test-instantiate -test-imports +test-globals test-import-function +test-imports +test-instantiate test-memory -test-module-imports test-module test-module-exports +test-module-imports test-tables -test-validate -rust-build \ No newline at end of file +test-validate \ No newline at end of file diff --git a/lib/runtime-c-api/tests/CMakeLists.txt b/lib/runtime-c-api/tests/CMakeLists.txt index c94c748e1..165261418 100644 --- a/lib/runtime-c-api/tests/CMakeLists.txt +++ b/lib/runtime-c-api/tests/CMakeLists.txt @@ -1,17 +1,17 @@ cmake_minimum_required (VERSION 2.6) project (WasmerRuntimeCApiTests) -add_executable(test-imports test-imports.c) add_executable(test-exports test-exports.c) add_executable(test-globals test-globals.c) -add_executable(test-instantiate test-instantiate.c) add_executable(test-import-function test-import-function.c) +add_executable(test-imports test-imports.c) +add_executable(test-instantiate test-instantiate.c) add_executable(test-memory test-memory.c) -add_executable(test-module-imports test-module-imports.c) add_executable(test-module test-module.c) add_executable(test-module-exports test-module-exports.c) -add_executable(test-validate test-validate.c) +add_executable(test-module-imports test-module-imports.c) add_executable(test-tables test-tables.c) +add_executable(test-validate test-validate.c) find_library( WASMER_LIB NAMES libwasmer_runtime_c_api.dylib libwasmer_runtime_c_api.so libwasmer_runtime_c_api.dll @@ -34,10 +34,6 @@ set( "/WX" > ) -target_link_libraries(test-imports general ${WASMER_LIB}) -target_compile_options(test-imports PRIVATE ${COMPILER_OPTIONS}) -add_test(test-imports test-imports) - target_link_libraries(test-exports general ${WASMER_LIB}) target_compile_options(test-exports PRIVATE ${COMPILER_OPTIONS}) add_test(test-exports test-exports) @@ -46,22 +42,22 @@ target_link_libraries(test-globals general ${WASMER_LIB}) target_compile_options(test-globals PRIVATE ${COMPILER_OPTIONS}) add_test(test-globals test-globals) -target_link_libraries(test-instantiate general ${WASMER_LIB}) -target_compile_options(test-instantiate PRIVATE ${COMPILER_OPTIONS}) -add_test(test-instantiate test-instantiate) - target_link_libraries(test-import-function general ${WASMER_LIB}) target_compile_options(test-import-function PRIVATE ${COMPILER_OPTIONS}) add_test(test-import-function test-import-function) +target_link_libraries(test-imports general ${WASMER_LIB}) +target_compile_options(test-imports PRIVATE ${COMPILER_OPTIONS}) +add_test(test-imports test-imports) + +target_link_libraries(test-instantiate general ${WASMER_LIB}) +target_compile_options(test-instantiate PRIVATE ${COMPILER_OPTIONS}) +add_test(test-instantiate test-instantiate) + target_link_libraries(test-memory general ${WASMER_LIB}) target_compile_options(test-memory PRIVATE ${COMPILER_OPTIONS}) add_test(test-memory test-memory) -target_link_libraries(test-module-imports general ${WASMER_LIB}) -target_compile_options(test-module-imports PRIVATE ${COMPILER_OPTIONS}) -add_test(test-module-imports test-module-imports) - target_link_libraries(test-module general ${WASMER_LIB}) target_compile_options(test-module PRIVATE ${COMPILER_OPTIONS}) add_test(test-module test-module) @@ -70,10 +66,14 @@ target_link_libraries(test-module-exports general ${WASMER_LIB}) target_compile_options(test-module-exports PRIVATE ${COMPILER_OPTIONS}) add_test(test-module-exports test-module-exports) -target_link_libraries(test-validate general ${WASMER_LIB}) -target_compile_options(test-validate PRIVATE ${COMPILER_OPTIONS}) -add_test(test-validate test-validate) +target_link_libraries(test-module-imports general ${WASMER_LIB}) +target_compile_options(test-module-imports PRIVATE ${COMPILER_OPTIONS}) +add_test(test-module-imports test-module-imports) target_link_libraries(test-tables general ${WASMER_LIB}) target_compile_options(test-tables PRIVATE ${COMPILER_OPTIONS}) add_test(test-tables test-tables) + +target_link_libraries(test-validate general ${WASMER_LIB}) +target_compile_options(test-validate PRIVATE ${COMPILER_OPTIONS}) +add_test(test-validate test-validate)