Use fetched Catch2 and simplify vcpkg dependencies#9
Merged
Conversation
heifner
approved these changes
May 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This removes Catch2 and LLVM from the vcpkg manifest/custom registry path.
softfloatis now the only vcpkg dependency for eos-vm.Catch2 is only used when
ENABLE_TESTS=ON. Thewire-sys-vmregistry port explicitly configures eos-vm with tests disabled, so depending on Catch2 during vcpkg packaging was unnecessary in the first place. On top of that, eos-vm intentionally uses an old Catch2 revision, matching the original eos-vmexternal/Catch2submodule commit. That old Catch2 version is not shared by the other repos in the Wire system. Maintaining an independent vcpkg Catch2 port, with ano-posix-signalsconfiguration used only by this repo's tests, adds registry maintenance without providing reuse value.Instead, eos-vm tests now use CMake
FetchContentpinned to the historical Catch2 commit:9c741fe96073ed620ffc032afbed1f3c789d2b68This keeps the Catch2 choice local to eos-vm tests and lets the shared Wire vcpkg registry stop carrying repo-specific Catch2 behavior.
LLVM is removed for the same reason: it is not used by the sys-vm library or packaging path. The VM JIT is hand-written machine-code emission, not LLVM. The only local LLVM-related use was the fuzz-test setup, so the fuzz CMake now checks whether the active compiler supports
-fsanitize=fuzzer,addressdirectly instead of forcing every vcpkg consumer to install a large LLVM package.Changes
catch2andllvmfromvcpkg.json;softfloatis now the only vcpkg dependency.vcpkg-configuration.jsonso the Wire custom registry only ownssoftfloatfor this repo.find_package(Catch2)andfind_package(LLVM)from dependency setup.FetchContentfor the pinned Catch2 test dependency.CATCH_CONFIG_NO_POSIX_SIGNALSon test targets.-fsanitize=fuzzer,addressinstead of depending on a vcpkg LLVM package.sysio::vmAPI and add a VM watchdog so long-running wasm corpus inputs are rejected cleanly.Validation
ENABLE_TESTS=OFFpasses; vcpkg resolves onlysoftfloatplus helper ports.clang-18:-fsanitize=fuzzer,addresspassesLLVMFuzzer-wasm_fuzz_testbuildsctest -R wasm_libfuzzerpasses with the full current corpusNotes
No changes are required in
wire-vcpkg-registryfor this PR, but after this lands the custom Catch2 port there should be removable if no other repo depends on it.