Skip to content
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

fix: add missing tools for wasm local compile #1013

Merged
merged 3 commits into from
Jan 20, 2025
Merged

fix: add missing tools for wasm local compile #1013

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
7cdee84
fix: add missing tools for wasm local compile
puria Jan 20, 2025
8b2c4fc
build: hidden target to generate the ./zenroom wrapper for node-wasm
jaromil Jan 20, 2025
308e10b
fix: comment out the OOM msgpack test
jaromil Jan 20, 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
2 changes: 2 additions & 0 deletions .mise.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@
[tools]
emsdk = "4"
meson = "1"
node = "22"
rust = "stable"
yarn = "1"
12 changes: 8 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,14 @@ check: ## Run tests using the current binary executable build
"tests=['determinism','vectors','lua','zencode','blockchain','bindings','api']"
ninja -C meson test

check-js: ## Run tests using the WASM build for Node
yarn --cwd bindings/javascript test
wrap-js: # Generate the ./zenroom exec wrapper on node-wasm builds
$(info Generate JS wrapper in ./zenroom)
@sed 's@=ROOT=@'"${pwd}"'@' test/zexe_js_wrapper.sh > zenroom
@chmod +x zenroom

check-js: ## Run tests using the WASM build for Node
yarn --cwd bindings/javascript test
$(MAKE) wrap-js
meson setup meson/ build/ -D "tests=['lua','zencode']"
ninja -C meson test

Expand All @@ -93,8 +97,8 @@ check-osx: ## Run tests using the OSX binary executable build
install: destbin=${DESTDIR}${PREFIX}/bin
install: destdocs=${DESTDIR}${PREFIX}/share/zenroom
install:
install -p -s src/zenroom ${destbin}/zenroom
install -p -s src/zencode-exec ${destbin}/zencode-exec
install -p -s zenroom ${destbin}/zenroom
install -p -s zencode-exec ${destbin}/zencode-exec
install -d ${destdocs}/docs
if [ -d docs/website/site ]; then cd docs/website/site && cp -ra * ${destdocs}/docs/; cd -; fi
if [ -d docs/Zencode_Whitepaper.pdf ]; then cp -ra docs/Zencode_Whitepaper.pdf ${destdocs}/; fi
Expand Down
17 changes: 10 additions & 7 deletions test/lua/msgpack.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,14 +213,17 @@ do
for i = 1, 0xffff do assert(map['item_' .. i], i) end
end

--- This test uses 1555128 KB of memory using Zenroom native
-- and crashes the node-wasm tests
--
-- test map 32
do
local map = {}; for i = 1, 0x10000 do map['item_' .. i] = i end -- prepare test map
local bytes = assert(msgpack.encode(map))
assert(string.byte(bytes) == 0xdf)
map = assert(msgpack.decode(bytes))
for i = 1, 0x10000 do assert(map['item_' .. i], i) end
end
-- do
-- local map = {}; for i = 1, 0x10000 do map['item_' .. i] = i end -- prepare test map
-- local bytes = assert(msgpack.encode(map))
-- assert(string.byte(bytes) == 0xdf)
-- map = assert(msgpack.decode(bytes))
-- for i = 1, 0x10000 do assert(map['item_' .. i], i) end
-- end

-- test fixed strings
for i = 0, 31 do
Expand Down
Loading