Skip to content

Refactor test-programs to build modules and components #6385

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

Merged
pchickey merged 27 commits into from
May 17, 2023
Merged

Refactor test-programs to build modules and components #6385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
41747c6
wasi-tests and wasi-http-tests no longer have their own workspace
May 16, 2023
b0a9546
wasi-tests: fix warnings
May 15, 2023
372b3d5
rewrite the test-programs build.rs to generate {package}_modules.rs a…
May 16, 2023
ba9eb15
better escaping should help with windows?
May 16, 2023
9ecdd18
long form cap-std-sync and tokio test suites
May 16, 2023
3128781
convert wasi-http test
May 16, 2023
03a3666
fixes, comments
May 16, 2023
b1b5bf2
apply cargo fmt to whole workspace
May 16, 2023
cc7d5b7
bump test-programs and wasi-http-tests to all use common dependency v…
May 16, 2023
54f27b3
add new audits
May 16, 2023
e571f17
cargo vet prune
May 16, 2023
6dc01cc
package and supply chain updates to fix vulnerabilities
May 16, 2023
4745cab
deny: temporarily allow duplicate wasm-encoder, wasmparser, wit-parser
May 16, 2023
1058345
convert more dependencies to { workspace = true }
May 16, 2023
4c29127
test-programs build: ensure that the user writes a #[test] for each m…
May 16, 2023
d7fe7df
fix build of wasi-tests on windows
May 16, 2023
bff004b
misspelled macos
May 16, 2023
87fedb5
Merge remote-tracking branch 'origin/main' into pch/test_programs
May 16, 2023
33b113f
mark wasi-tests crate test=false so we dont try building it natively...
May 16, 2023
4052142
mark wasi-http-tests test=false as well
May 16, 2023
729717f
try getting the cargo keys right
May 16, 2023
6d24e08
just exclude wasi-tests and wasi-http-tests in run-tests.sh
May 17, 2023
cc78a6c
interesting paths fails on windows
May 17, 2023
f29d686
misspelling so nice i did it twice
May 17, 2023
e27e134
Merge remote-tracking branch 'origin/main' into pch/test_programs
May 17, 2023
68e0963
new cargo deny exception: ignore all of wit-bindgen's dependencies
May 17, 2023
b3e16e2
auto-import wildcard vets
May 17, 2023
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
141 changes: 103 additions & 38 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 28 additions & 10 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ rustix = { workspace = true, features = ["mm", "param"] }
wasmtime = { workspace = true, features = ['component-model', 'async', 'default', 'winch'] }
env_logger = { workspace = true }
log = { workspace = true }
filecheck = "0.5.0"
tempfile = "3.1.0"
filecheck = { workspace = true }
tempfile = { workspace = true }
test-programs = { path = "crates/test-programs" }
wasmtime-runtime = { workspace = true }
tokio = { version = "1.8.0", features = ["rt", "time", "macros", "rt-multi-thread"] }
Expand Down Expand Up @@ -97,6 +97,8 @@ members = [
"crates/cli-flags",
"crates/environ/fuzz",
"crates/jit-icache-coherence",
"crates/test-programs/wasi-tests",
"crates/test-programs/wasi-http-tests",
"crates/wasi-preview1-component-adapter",
"crates/wasi-preview1-component-adapter/verify",
"crates/winch",
Expand Down Expand Up @@ -179,8 +181,21 @@ winch-test-macros = { path = "winch/test-macros" }
wasi-preview1-component-adapter = { path = "crates/wasi-preview1-component-adapter" }
byte-array-literals = { path = "crates/wasi-preview1-component-adapter/byte-array-literals" }

# Bytecode Alliance maintained dependencies:
# ---------------------------
regalloc2 = "0.8.1"

# cap-std family:
target-lexicon = { version = "0.12.3", default-features = false, features = ["std"] }
anyhow = "1.0.22"
cap-std = "1.0.0"
cap-rand = "1.0.0"
io-lifetimes = { version = "1.0.0", default-features = false }
rustix = "0.37.13"

# wit-bindgen:
wit-bindgen = "0.6.0"

# wasm-tools family:
wasmparser = "0.105.0"
wat = "1.0.64"
wast = "58.0.0"
Expand All @@ -189,20 +204,21 @@ wasm-encoder = "0.27.0"
wasm-smith = "0.12.8"
wasm-mutate = "0.2.25"
wit-parser = "0.7.1"
wit-component = "0.9.0"

# Non-Bytecode Alliance maintained dependencies:
# --------------------------
object = { version = "0.30.3", default-features = false, features = ['read_core', 'elf', 'std'] }
gimli = { version = "0.27.0", default-features = false, features = ['read', 'std'] }
anyhow = "1.0.22"
windows-sys = "0.48.0"
env_logger = "0.10"
rustix = "0.37.13"
log = { version = "0.4.8", default-features = false }
object = { version = "0.30.3", default-features = false, features = ['read_core', 'elf', 'std'] }
gimli = { version = "0.27.0", default-features = false, features = ['read', 'std'] }
clap = { version = "3.2.0", features = ["color", "suggestions", "derive"] }
hashbrown = "0.13.2"
cap-std = "1.0.0"
cap-rand = "1.0.0"
capstone = "0.9.0"
once_cell = "1.12.0"
smallvec = { version = "1.6.1", features = ["union"] }
io-lifetimes = { version = "1.0.0", default-features = false }
tracing = "0.1.26"
bitflags = "1.2"
thiserror = "1.0.15"
Expand All @@ -214,8 +230,10 @@ serde = "1.0.94"
serde_json = "1.0.80"
glob = "0.3.0"
libfuzzer-sys = "0.4.0"
regalloc2 = "0.8.1"
walkdir = "2.3.3"
cfg-if = "1.0"
tempfile = "3.1.0"
filecheck = "0.5.0"

[features]
default = [
Expand Down
Loading