Enable GC zealing for integration tests

bytecodealliance · Dec 20, 2024 · 88a3fbd · 88a3fbd
1 parent fb85134
commit 88a3fbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cmake/spidermonkey.cmake b/cmake/spidermonkey.cmake
@@ -1,4 +1,4 @@
-set(SM_REV b02d76023a15a3fa8c8f54bff5dac91099669003)
+set(SM_REV b30ec577023a5c62a779f7b9a9a1f14bd3b38cdd)
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(SM_BUILD_TYPE debug)
@@ -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
     )
 

diff --git a/tests/tests.cmake b/tests/tests.cmake
@@ -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)
@@ -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)