Skip to content

Enable GC zealing for integration tests #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
andreiltd wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Enable GC zealing for integration tests #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88a3fbd
Enable GC zealing for integration tests
andreiltd Dec 20, 2024
2f55fbb
Merge branch 'main' into gc-zeal
andreiltd Jan 20, 2025
acd4983
Merge branch 'main' into gc-zeal
andreiltd Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/spidermonkey.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(SM_REV b02d76023a15a3fa8c8f54bff5dac91099669003)
set(SM_REV b30ec577023a5c62a779f7b9a9a1f14bd3b38cdd)

if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(SM_BUILD_TYPE debug)
Expand All @@ -24,7 +24,7 @@ if (DEFINED ENV{SPIDERMONKEY_BINARIES})
set(SM_SOURCE_DIR $ENV{SPIDERMONKEY_BINARIES})
else()
CPMAddPackage(NAME spidermonkey-${SM_BUILD_TYPE}
URL https://github.com/bytecodealliance/spidermonkey-wasi-embedding/releases/download/rev_${SM_REV}/spidermonkey-wasm-static-lib_${SM_BUILD_TYPE}.tar.gz
URL https://github.com/andreiltd/spidermonkey-wasi-embedding/releases/download/rev_${SM_REV}/spidermonkey-wasm-static-lib_${SM_BUILD_TYPE}.tar.gz
DOWNLOAD_ONLY YES
)

Expand Down
8 changes: 4 additions & 4 deletions tests/tests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ include("weval")
function(test_e2e TEST_NAME)
get_target_property(RUNTIME_DIR starling-raw.wasm BINARY_DIR)
add_test(e2e-${TEST_NAME} ${BASH_PROGRAM} ${CMAKE_SOURCE_DIR}/tests/test.sh ${RUNTIME_DIR} ${CMAKE_SOURCE_DIR}/tests/e2e/${TEST_NAME})
set_property(TEST e2e-${TEST_NAME} PROPERTY ENVIRONMENT "WASMTIME=${WASMTIME};WIZER=${WIZER_DIR}/wizer;WASM_TOOLS=${WASM_TOOLS_DIR}/wasm-tools")
set_tests_properties(e2e-${TEST_NAME} PROPERTIES TIMEOUT 120)
set_property(TEST e2e-${TEST_NAME} PROPERTY ENVIRONMENT "WASMTIME=${WASMTIME};WIZER=${WIZER_DIR}/wizer;WASM_TOOLS=${WASM_TOOLS_DIR}/wasm-tools;JS_GC_ZEAL=VerifierPre\\;Alloc,10;")
set_tests_properties(e2e-${TEST_NAME} PROPERTIES TIMEOUT 300)
endfunction()

add_custom_target(integration-test-server DEPENDS test-server.wasm)
Expand All @@ -26,8 +26,8 @@ function(test_integration TEST_NAME)
)

add_test(integration-${TEST_NAME} ${BASH_PROGRAM} ${CMAKE_SOURCE_DIR}/tests/test.sh ${RUNTIME_DIR} ${CMAKE_SOURCE_DIR}/tests/integration/${TEST_NAME} ${RUNTIME_DIR}/test-server.wasm ${TEST_NAME})
set_property(TEST integration-${TEST_NAME} PROPERTY ENVIRONMENT "WASMTIME=${WASMTIME};WIZER=${WIZER_DIR}/wizer;WASM_TOOLS=${WASM_TOOLS_DIR}/wasm-tools;")
set_tests_properties(integration-${TEST_NAME} PROPERTIES TIMEOUT 120)
set_property(TEST integration-${TEST_NAME} PROPERTY ENVIRONMENT "WASMTIME=${WASMTIME};WIZER=${WIZER_DIR}/wizer;WASM_TOOLS=${WASM_TOOLS_DIR}/wasm-tools;JS_GC_ZEAL=VerifierPre\\;Alloc,10;")
set_tests_properties(integration-${TEST_NAME} PROPERTIES TIMEOUT 300)
endfunction()

test_e2e(blob)
Expand Down