Refactor test-programs to build modules and components #6385

pchickey · 2023-05-16T03:44:16Z

This is task 2 in #6370

On the tails of #6374, this adds support for test-programs to build components out of preview 1 modules.

But thats really just the side story for this PR, which rewrites the entire way that test-programs works. Over in preview2-prototyping, I got tired of doing a bunch of code generation of all the #[test] functions, which makes it tests to read and hard to modify.

So, I trimmed code generation in test-programs/build.rs down to the bare minimum: it calls out to cargo to build the test program crates, and then we have a function module_rs() which writes a source file {test-crate}_modules.rs into OUT_DIR. This source file defines a function get_module(&str) -> Module which gives the user the module corresponding to the binary name.

For test program crates which can be built into components, you can invoke component_rs() which creates {test-crate}_components.rs in OUT_DIR, and you use get_component(&str) -> wasmtime::component::Component. One extra argument is required: a built adapter, which is the command build of wasi-preview1-component-adapter from this tree.

As part of this rewrite, we generate the components for the test crates, but we don't actually execute them yet, because we need a host implementation of preview 2 to do so. Sit tight - that is coming in the very next PR!

…nd _components.rs The style is cribbed from preview2-prototying repo, but I ended up refactoring it a bit.

…ersions wit-bindgen 0.6.0 and wit-component 0.7.4

h2 upgraded from 0.3.16 -> 0.3.19 to fix vulnerability tempfile upgraded from 0.3.3 -> 0.3.5 to eliminate dep on vulnerable remove_dir_all

pchickey · 2023-05-16T19:33:35Z

I am applying a temporary exception to deny.toml for duplicate dependencies on wasm-encoder, wasmparser, and wit-parser. The wasmtime project versions have fallen behind the latest wit-bindgen, and @itsrainy is going to update those shortly with their core dumps work.

I would typically just wait for that sort of work to finish up to land my PR, but I want to move along quickly so we can change the canonical home of the preview 2 work to this repository, which will unblock several other people.

prtest:full

crates/test-programs/Cargo.toml

alexcrichton · 2023-05-16T19:38:44Z

crates/test-programs/Cargo.toml


 [dev-dependencies]
+anyhow = { workspace = true }
+tempfile = "3.1.0"
+test-log = { version = "0.2", default-features = false, features = ["trace"] }


Oh? I've not seen this dependency before, what does it do?

It is provides a wrapper over #[test] (or e.g. #[tokio::test] if you pass it in as an argument) which takes care of installing tracing-subscriber with an env filter before starting your test. It gets rid of a Once cell we used to do that manually.

crates/test-programs/wasi-http-tests/Cargo.toml

alexcrichton · 2023-05-16T19:41:25Z

supply-chain/config.toml

-version = "0.3.16"
+version = "0.3.19"


Could this diff be audited to avoid adding a new exemption? (assuming that this diff is a relatively small one hopefully)

I could, I just figured that if we have an exemption I'd keep bumping it. I've been thinking about our exemptions of the tokio/hyper family (which this is a part of) is a wildcard audit for carl and sean.

Ok sounds reasonable 👍

alexcrichton · 2023-05-16T19:42:01Z

supply-chain/config.toml

@@ -641,6 +637,10 @@ criteria = "safe-to-deploy"
 version = "0.2.13"
 criteria = "safe-to-deploy"

+[[exemptions.redox_syscall]]
+version = "0.3.5"


Could you check to see if 0.2.13, which is exempted, is a small or big diff from 0.3.5? If small mind adding an audit for that? If big though it's a bit of a bummer but we can probably live with an exemption.

I didn't want to do any sort of audit on this because it is the redox syscall layer, an OS I don't know anything about and don't think we care about in the context of this project. It just happens to be a transitive dep in some crates.

Ok sounds reasonable 👍

crates/test-programs/tests/wasi-tokio.rs

Alex asked me to do thsi for wit-component and wit-bindgen, and I found a few more (cfg-if, tempfile, filecheck, anyhow... I also reorganized the workspace dependencies section to make the ones our team maintains more clearly separated from our external dependencies.

…odule, component

pchickey · 2023-05-17T17:47:08Z

#6385 (comment) This change was backed out as part of merging with main after #6394 landed. Thank you @itsrainy.

Unfortunately, even with those fixes, there were still multiple versions of wasm-tools crates in the workspace, via the transitive dependencies of wit-bindgen. Alex and I decided that, since wit-bindgen is only used to build component tests, we will add a deny exception for its dependency tree.

pchickey force-pushed the pch/test_programs branch from 336e465 to cbd5c0f Compare May 16, 2023 03:45

Pat Hickey added 12 commits May 16, 2023 12:26

wasi-tests and wasi-http-tests no longer have their own workspace

41747c6

wasi-tests: fix warnings

b0a9546

rewrite the test-programs build.rs to generate {package}_modules.rs a…

372b3d5

…nd _components.rs The style is cribbed from preview2-prototying repo, but I ended up refactoring it a bit.

better escaping should help with windows?

ba9eb15

long form cap-std-sync and tokio test suites

9ecdd18

convert wasi-http test

3128781

fixes, comments

03a3666

apply cargo fmt to whole workspace

b1b5bf2

bump test-programs and wasi-http-tests to all use common dependency v…

cc7d5b7

…ersions wit-bindgen 0.6.0 and wit-component 0.7.4

add new audits

54f27b3

cargo vet prune

e571f17

package and supply chain updates to fix vulnerabilities

6dc01cc

h2 upgraded from 0.3.16 -> 0.3.19 to fix vulnerability tempfile upgraded from 0.3.3 -> 0.3.5 to eliminate dep on vulnerable remove_dir_all

pchickey force-pushed the pch/test_programs branch from f44643f to 41e99f7 Compare May 16, 2023 19:31

pchickey marked this pull request as ready for review May 16, 2023 19:31

pchickey requested review from a team as code owners May 16, 2023 19:31

pchickey requested review from jameysharp and removed request for a team May 16, 2023 19:31

pchickey requested review from alexcrichton and removed request for jameysharp May 16, 2023 19:33

deny: temporarily allow duplicate wasm-encoder, wasmparser, wit-parser

4745cab

prtest:full

pchickey force-pushed the pch/test_programs branch from 41e99f7 to 4745cab Compare May 16, 2023 19:37

alexcrichton approved these changes May 16, 2023

View reviewed changes

pchickey requested a review from a team as a code owner May 16, 2023 20:09

pchickey requested review from abrown and removed request for a team and abrown May 16, 2023 20:09

test-programs build: ensure that the user writes a #[test] for each m…

4c29127

…odule, component

pchickey force-pushed the pch/test_programs branch from 7c4fe4a to 4c29127 Compare May 16, 2023 20:32

pchickey enabled auto-merge May 16, 2023 20:32

github-actions bot added the cranelift Issues related to the Cranelift code generator label May 16, 2023

Pat Hickey added 3 commits May 16, 2023 14:39

fix build of wasi-tests on windows

d7fe7df

misspelled macos

bff004b

Merge remote-tracking branch 'origin/main' into pch/test_programs

87fedb5

pchickey mentioned this pull request May 16, 2023

Land preview2-prototyping's Wasi Preview 2 implementation into wasmtime #6391

Merged

Pat Hickey added 4 commits May 16, 2023 16:16

mark wasi-tests crate test=false so we dont try building it natively...

33b113f

mark wasi-http-tests test=false as well

4052142

try getting the cargo keys right

729717f

just exclude wasi-tests and wasi-http-tests in run-tests.sh

6d24e08

itsrainy mentioned this pull request May 17, 2023

Update wasm-tools crates to latest versions. #6394

Merged

interesting paths fails on windows

cc78a6c

pchickey disabled auto-merge May 17, 2023 02:57

Pat Hickey added 4 commits May 17, 2023 10:26

misspelling so nice i did it twice

f29d686

Merge remote-tracking branch 'origin/main' into pch/test_programs

e27e134

new cargo deny exception: ignore all of wit-bindgen's dependencies

68e0963

auto-import wildcard vets

b3e16e2

pchickey enabled auto-merge May 17, 2023 17:51

pchickey added this pull request to the merge queue May 17, 2023

Merged via the queue into main with commit 338b535 May 17, 2023

pchickey deleted the pch/test_programs branch May 17, 2023 18:57

brendandburns mentioned this pull request May 17, 2023

Add allow list for HTTP methods/schemes/authorities #6401

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor test-programs to build modules and components #6385

Refactor test-programs to build modules and components #6385

pchickey commented May 16, 2023 •

edited

Loading

pchickey commented May 16, 2023

alexcrichton May 16, 2023

pchickey May 16, 2023 •

edited

Loading

alexcrichton May 16, 2023

pchickey May 16, 2023

alexcrichton May 16, 2023

alexcrichton May 16, 2023

pchickey May 16, 2023

alexcrichton May 16, 2023

pchickey commented May 17, 2023

Refactor test-programs to build modules and components #6385

Refactor test-programs to build modules and components #6385

Conversation

pchickey commented May 16, 2023 • edited Loading

pchickey commented May 16, 2023

alexcrichton May 16, 2023

Choose a reason for hiding this comment

pchickey May 16, 2023 • edited Loading

Choose a reason for hiding this comment

alexcrichton May 16, 2023

Choose a reason for hiding this comment

pchickey May 16, 2023

Choose a reason for hiding this comment

alexcrichton May 16, 2023

Choose a reason for hiding this comment

alexcrichton May 16, 2023

Choose a reason for hiding this comment

pchickey May 16, 2023

Choose a reason for hiding this comment

alexcrichton May 16, 2023

Choose a reason for hiding this comment

pchickey commented May 17, 2023

pchickey commented May 16, 2023 •

edited

Loading

pchickey May 16, 2023 •

edited

Loading