Move integration tests to `tests` dir in workspace root #1349

MarkMcCaskey · 2020-04-02T00:12:30Z

Reorganizing some of our tests.

Still tests left to migrate and a few bugs to fix.

Review

Add a short description of the the change to the CHANGELOG.md file

syrusakbary · 2020-04-02T00:57:50Z

Some feedback:

Can we rename tests/wasitests to tests/wasi?
Can generate-wasi-tests be just an .rs file rather than a crate? (that way, we can reuse the dependencies, via dev-dependencies in the toplevel cargo)

MarkMcCaskey · 2020-04-02T02:09:55Z

Some feedback:

* Can we rename `tests/wasitests` to `tests/wasi`?

* Can `generate-wasi-tests` be just an `.rs` file rather than a crate? (that way, we can reuse the dependencies, via `dev-dependencies` in the toplevel cargo)

Renaming is easy! I had trouble getting this to work properly without having them be crates: the current design is designed around calling code from a top level build.rs and I don't know how we'd import it otherwise.

It's gone through quite a few iterations already to get here, but I'm sure there's ways to improve it

syrusakbary · 2020-04-02T02:10:55Z

I had trouble getting this to work properly without having them be crates: the current design is designed around calling code from a top level build.rs and I don't know how we'd import it otherwise.

Ok, fair point!

MarkMcCaskey · 2020-04-03T21:25:20Z

bors try

bors · 2020-04-03T21:48:34Z

try

Build failed

wasmerio.wasmer

MarkMcCaskey · 2020-04-03T23:28:13Z

bors try

MarkMcCaskey · 2020-04-03T23:40:44Z

bors try

bors · 2020-04-03T23:40:45Z

try

Already running a review

MarkMcCaskey · 2020-04-03T23:40:50Z

bors try-

MarkMcCaskey · 2020-04-03T23:40:54Z

bors try

bors · 2020-04-04T00:04:21Z

try

Build failed

wasmerio.wasmer

MarkMcCaskey · 2020-04-04T00:04:40Z

bors try

bors · 2020-04-04T00:34:57Z

try

Build failed

wasmerio.wasmer

MarkMcCaskey · 2020-04-06T19:05:11Z

bors try

MarkMcCaskey · 2020-04-06T19:35:39Z

bors try-

MarkMcCaskey · 2020-04-06T19:35:45Z

bors try

bors · 2020-04-06T20:05:52Z

try

Build failed

wasmerio.wasmer

MarkMcCaskey · 2020-04-06T21:14:27Z

bors try

bors · 2020-04-06T21:50:44Z

try

Build succeeded

wasmerio.wasmer

MarkMcCaskey · 2020-04-06T23:47:40Z

bors r+

1349: Move integration tests to `tests` dir in workspace root r=MarkMcCaskey a=MarkMcCaskey Reorganizing some of our tests. Still tests left to migrate and a few bugs to fix. # Review - [ ] Add a short description of the the change to the CHANGELOG.md file Co-authored-by: Mark McCaskey <[email protected]>

bors · 2020-04-07T00:14:49Z

Canceled

MarkMcCaskey · 2020-04-07T00:14:56Z

bors r+

1349: Move integration tests to `tests` dir in workspace root r=MarkMcCaskey a=MarkMcCaskey Reorganizing some of our tests. Still tests left to migrate and a few bugs to fix. # Review - [ ] Add a short description of the the change to the CHANGELOG.md file 1357: Refactored bin commands into separate files r=syrusakbary a=syrusakbary  # Description Refactored bin commands into separate files. This PR does not do any sustancial changes other than refactoring into different files for better readability.  # Review - [x] Add a short description of the the change to the CHANGELOG.md file Co-authored-by: Mark McCaskey <[email protected]> Co-authored-by: Syrus <[email protected]> Co-authored-by: Syrus Akbary <[email protected]>

nlewycky · 2020-04-06T23:58:12Z

Cargo.toml

 crate-type = ["bin"]

 [[example]]
 name = "callback"
-crate-type = ["bin"]
+crate-type = ["bin"]


can we have the trailing newline back?

Hmm, usually when these get removed it's due to some tool doing it. I don't know if rustfmt affects cargo toml files (not sure what else it could be) 🤔

Or maybe I accidentally deleted it 😆

nlewycky · 2020-04-07T00:08:45Z

tests/emtests/_common.rs

+        use wasmer_dev_utils::stdio::StdioCapturer;
+
+        let wasm_bytes = include_bytes!($file);
+        let backend = $crate::emtests::_common::get_backend().expect("Please set one of `WASMER_TEST_CLIF`, `WASMER_TEST_LLVM`, or `WASMER_TEST_SINGELPASS` to `1`.");


Note that this error string may make a suggestion that won't help (WASM_TEST_LLVM=1 when llvm isn't compiled in).

I'm fine with that for now, spectests has its own version of this code that's more robust. Ideally we'll combine them together but that should be done in a PR where it's possible to read and understand the diff

nlewycky · 2020-04-07T00:10:27Z

tests/generate-emscripten-tests/src/emtests.rs

+
+static BANNER: &str =
+    "// Rust test file autogenerated with cargo build (generate-emscripten-tests).
+// Please do NOT modify it by hand, as it will be reseted on next build.\n";


Suggested change

// Please do NOT modify it by hand, as it will be reseted on next build.\n";

// Please do NOT modify it by hand, as it will be reset on next build.\n";

That's probably my english 😂

MarkMcCaskey · 2020-04-07T00:21:18Z

bors r-

bors · 2020-04-07T00:21:19Z

Canceled

MarkMcCaskey · 2020-04-07T00:22:34Z

bors r+

1349: Move integration tests to `tests` dir in workspace root r=MarkMcCaskey a=MarkMcCaskey Reorganizing some of our tests. Still tests left to migrate and a few bugs to fix. # Review - [ ] Add a short description of the the change to the CHANGELOG.md file 1357: Refactored bin commands into separate files r=syrusakbary a=syrusakbary  # Description Refactored bin commands into separate files. This PR does not do any sustancial changes other than refactoring into different files for better readability.  # Review - [x] Add a short description of the the change to the CHANGELOG.md file Co-authored-by: Mark McCaskey <[email protected]> Co-authored-by: Syrus <[email protected]> Co-authored-by: Syrus Akbary <[email protected]>

bors · 2020-04-07T01:17:59Z

Build failed (retrying...)

wasmerio.wasmer

syrusakbary · 2020-04-07T01:40:46Z

Merging manually

Move integration tests to tests dir in workspace root

976bf9b

Mark McCaskey added 2 commits April 2, 2020 16:51

Move emscripten-tests to tests dir + misc fixes

513e6ac

Move spectests, wrap up test restructure

dfa6247

bors bot added a commit that referenced this pull request Apr 3, 2020

Try #1349:

ea3e5c3

bors bot added a commit that referenced this pull request Apr 3, 2020

Try #1349:

278eb75

syrusakbary approved these changes Apr 3, 2020

View reviewed changes

bors bot added a commit that referenced this pull request Apr 3, 2020

Try #1349:

0c509ee

bors bot added a commit that referenced this pull request Apr 4, 2020

Try #1349:

3dbea20

bors bot added a commit that referenced this pull request Apr 6, 2020

Try #1349:

f98118c

Add support for android in spectests

9d312f4

bors bot added a commit that referenced this pull request Apr 6, 2020

Try #1349:

789b96d

Only run runtime_core tests on Android

b6011d5

bors bot added a commit that referenced this pull request Apr 6, 2020

Try #1349:

9772988

Fix emtests and wasitests to use the correct backend

3579d0d

MarkMcCaskey marked this pull request as ready for review April 6, 2020 23:47

MarkMcCaskey requested a review from nlewycky as a code owner April 6, 2020 23:47

nlewycky approved these changes Apr 7, 2020

View reviewed changes

Use CRANELIFT instead of CLIF in test env vars

ade38aa

MarkMcCaskey force-pushed the feature/reorganized-tests branch from 515e49c to ade38aa Compare April 7, 2020 00:22

syrusakbary merged commit bc75790 into master Apr 7, 2020

bors bot deleted the feature/reorganized-tests branch April 7, 2020 01:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move integration tests to `tests` dir in workspace root #1349

Move integration tests to `tests` dir in workspace root #1349

MarkMcCaskey commented Apr 2, 2020

syrusakbary commented Apr 2, 2020 •

edited

Loading

MarkMcCaskey commented Apr 2, 2020

syrusakbary commented Apr 2, 2020

MarkMcCaskey commented Apr 3, 2020

bors bot commented Apr 3, 2020

MarkMcCaskey commented Apr 3, 2020

MarkMcCaskey commented Apr 3, 2020

bors bot commented Apr 3, 2020

MarkMcCaskey commented Apr 3, 2020

MarkMcCaskey commented Apr 3, 2020

bors bot commented Apr 4, 2020

MarkMcCaskey commented Apr 4, 2020

bors bot commented Apr 4, 2020

MarkMcCaskey commented Apr 6, 2020

MarkMcCaskey commented Apr 6, 2020

MarkMcCaskey commented Apr 6, 2020

bors bot commented Apr 6, 2020

MarkMcCaskey commented Apr 6, 2020

bors bot commented Apr 6, 2020

MarkMcCaskey commented Apr 6, 2020

bors bot commented Apr 7, 2020

MarkMcCaskey commented Apr 7, 2020

nlewycky Apr 6, 2020

MarkMcCaskey Apr 7, 2020

MarkMcCaskey Apr 7, 2020

nlewycky Apr 7, 2020

MarkMcCaskey Apr 7, 2020

nlewycky Apr 7, 2020

syrusakbary Apr 7, 2020

MarkMcCaskey commented Apr 7, 2020

bors bot commented Apr 7, 2020

MarkMcCaskey commented Apr 7, 2020

bors bot commented Apr 7, 2020

syrusakbary commented Apr 7, 2020

	// Please do NOT modify it by hand, as it will be reseted on next build.\n";
	// Please do NOT modify it by hand, as it will be reset on next build.\n";

Move integration tests to tests dir in workspace root #1349

Move integration tests to tests dir in workspace root #1349

Conversation

MarkMcCaskey commented Apr 2, 2020

Review

syrusakbary commented Apr 2, 2020 • edited Loading

MarkMcCaskey commented Apr 2, 2020

syrusakbary commented Apr 2, 2020

MarkMcCaskey commented Apr 3, 2020

bors bot commented Apr 3, 2020

try

Build failed

MarkMcCaskey commented Apr 3, 2020

MarkMcCaskey commented Apr 3, 2020

bors bot commented Apr 3, 2020

try

MarkMcCaskey commented Apr 3, 2020

MarkMcCaskey commented Apr 3, 2020

bors bot commented Apr 4, 2020

try

Build failed

MarkMcCaskey commented Apr 4, 2020

bors bot commented Apr 4, 2020

try

Build failed

MarkMcCaskey commented Apr 6, 2020

MarkMcCaskey commented Apr 6, 2020

MarkMcCaskey commented Apr 6, 2020

bors bot commented Apr 6, 2020

try

Build failed

MarkMcCaskey commented Apr 6, 2020

bors bot commented Apr 6, 2020

try

Build succeeded

MarkMcCaskey commented Apr 6, 2020

bors bot commented Apr 7, 2020

Canceled

MarkMcCaskey commented Apr 7, 2020

nlewycky Apr 6, 2020

Choose a reason for hiding this comment

MarkMcCaskey Apr 7, 2020

Choose a reason for hiding this comment

MarkMcCaskey Apr 7, 2020

Choose a reason for hiding this comment

nlewycky Apr 7, 2020

Choose a reason for hiding this comment

MarkMcCaskey Apr 7, 2020

Choose a reason for hiding this comment

nlewycky Apr 7, 2020

Choose a reason for hiding this comment

syrusakbary Apr 7, 2020

Choose a reason for hiding this comment

MarkMcCaskey commented Apr 7, 2020

bors bot commented Apr 7, 2020

Canceled

MarkMcCaskey commented Apr 7, 2020

bors bot commented Apr 7, 2020

Build failed (retrying...)

syrusakbary commented Apr 7, 2020

Move integration tests to `tests` dir in workspace root #1349

Move integration tests to `tests` dir in workspace root #1349

syrusakbary commented Apr 2, 2020 •

edited

Loading