-
Notifications
You must be signed in to change notification settings - Fork 11.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Move/Examples] Switch to datatest (#18813)
## Description Use `datatest-stable` to find all the Move examples we might want to build and test, instead of stashing this away in a rust test. ## Test plan ``` sui$ cargo nextest run -p sui-framework-tests --test move_tests ``` + CI Closes #18802 --- ## Release notes Check each box that your changes affect. If none of the boxes relate to your changes, release notes aren't required. For each box you select, include information after the relevant heading that describes the impact of your changes that a user might notice and any actions they must take to implement updates. - [ ] Protocol: - [ ] Nodes (Validators and Full nodes): - [ ] Indexer: - [ ] JSON-RPC: - [ ] GraphQL: - [ ] CLI: - [ ] Rust SDK: - [ ] REST API:
- Loading branch information
Showing
6 changed files
with
87 additions
and
118 deletions.
There are no files selected for viewing
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,5 @@ | ||
// Copyright (c) Mysten Labs, Inc. | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
#[cfg(test)] | ||
mod unit_tests; | ||
|
||
#[cfg(test)] | ||
mod metered_verifier; |
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
// Copyright (c) Mysten Labs, Inc. | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
use std::path::Path; | ||
|
||
use move_cli::base::test::UnitTestResult; | ||
use move_package::LintFlag; | ||
use move_unit_test::UnitTestingConfig; | ||
use sui_move::unit_test::run_move_unit_tests; | ||
use sui_move_build::BuildConfig; | ||
|
||
pub(crate) const EXAMPLES: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../../examples"); | ||
pub(crate) const FRAMEWORK: &str = concat!( | ||
env!("CARGO_MANIFEST_DIR"), | ||
"/../../crates/sui-framework/packages" | ||
); | ||
|
||
/// Ensure packages build outside of test mode. | ||
pub(crate) fn build(path: &Path) -> datatest_stable::Result<()> { | ||
let Some(path) = path.parent() else { | ||
panic!("No parent for Move.toml file at: {}", path.display()); | ||
}; | ||
|
||
let mut config = BuildConfig::new_for_testing(); | ||
config.config.dev_mode = true; | ||
config.run_bytecode_verifier = true; | ||
config.print_diags_to_stderr = true; | ||
config.config.warnings_are_errors = true; | ||
config.config.silence_warnings = false; | ||
config.config.lint_flag = LintFlag::LEVEL_DEFAULT; | ||
|
||
config | ||
.build(path) | ||
.unwrap_or_else(|e| panic!("Building package {}.\nWith error {e}", path.display())); | ||
|
||
Ok(()) | ||
} | ||
|
||
/// Ensure package sbuild under test mode and all the tests pass. | ||
pub(crate) fn tests(path: &Path) -> datatest_stable::Result<()> { | ||
let Some(path) = path.parent() else { | ||
panic!("No parent for Move.toml file at: {}", path.display()); | ||
}; | ||
|
||
let mut config = BuildConfig::new_for_testing(); | ||
|
||
config.config.dev_mode = true; | ||
config.config.test_mode = true; | ||
config.run_bytecode_verifier = true; | ||
config.print_diags_to_stderr = true; | ||
config.config.warnings_are_errors = true; | ||
config.config.silence_warnings = false; | ||
config.config.lint_flag = LintFlag::LEVEL_DEFAULT; | ||
|
||
let move_config = config.config.clone(); | ||
let mut testing_config = UnitTestingConfig::default_with_bound(Some(3_000_000)); | ||
testing_config.filter = std::env::var("FILTER").ok().map(|s| s.to_string()); | ||
|
||
assert_eq!( | ||
run_move_unit_tests(path, move_config, Some(testing_config), false).unwrap(), | ||
UnitTestResult::Success | ||
); | ||
|
||
Ok(()) | ||
} | ||
|
||
datatest_stable::harness!( | ||
build, | ||
EXAMPLES, | ||
r".*/Move.toml$", | ||
tests, | ||
EXAMPLES, | ||
r".*/Move.toml$", | ||
build, | ||
FRAMEWORK, | ||
r".*/Move.toml$", | ||
tests, | ||
FRAMEWORK, | ||
r".*/Move.toml$", | ||
); |