Remove hard coded Wasm paths in abitest & hello_world #578
Conversation
This file contains 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
daviddrysdale
approved these changes
Feb 7, 2020
| @@ -440,7 +440,7 @@ fn test_say_hello() { | |||
| simple_logger::init().unwrap(); | |||
|
|
|||
| let configuration = oak_tests::test_configuration( | |||
| &[(MODULE_CONFIG_NAME, WASM_PATH)], | |||
| build_wasm().expect("failed to build wasm modules"), | |||
| LOG_CONFIG_NAME, | |||
There was a problem hiding this comment.
Could you also update the text around l.469-470 which is out of sync?
examples/abitest/tests/src/tests.rs
Outdated
| const BACKEND_WASM_NAME: &str = "abitest_1_backend.wasm"; | ||
|
|
||
| fn build_wasm() -> std::io::Result<Vec<(String, Vec<u8>)>> { | ||
| let mut frontend = oak_tests::compile_rust_to_wasm(FRONTEND_MANIFEST)?; |
There was a problem hiding this comment.
Maybe add an extra module_name parameter to compile_rust_to_wasm and do the full path creation inside it? (So this would be oak_tests::compile_rust_wasm(FRONTEND_MANIFEST, FRONTEND_WASM_NAME) with no .pushing needed)
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.
Removes hard coded Wasm paths in abitest & hello_world, and builds the Wasm modules during test invocation.
The Wasm files are outputted to a temporary directory and cargo doesn't seem to use artefacts from the host target dir so this does currently cause the tests to do a full rebuild of their Wasm files.
Checklist
cover any TODOs and/or unfinished work.
construction.
#541