Skip to content

feat: enable -Ztypeck for some solc tests #667

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

Open
stevencartavia wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −2
Open

feat: enable -Ztypeck for some solc tests #667

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 25 additions & 2 deletions tools/tester/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,25 @@ fn per_file_config(config: &mut ui_test::Config, file: &Spanned<Vec<u8>>, cfg: M
fn solc_per_file_config(config: &mut ui_test::Config, src: &str, path: &Path, cfg: MyConfig<'_>) {
let expected_errors = errors::Error::load_solc(src);
let expected_error = expected_errors.iter().find(|e| e.is_error());

// Enable typechecking for tests with TypeError expectations in syntaxTests.
// Currently limited to basic cases as the typechecker develops.
let has_type_errors = expected_errors.iter().any(|e| {
e.solc_kind.is_some_and(|kind| matches!(kind, crate::solc::SolcErrorKind::TypeError))
}) && path.to_string_lossy().contains("syntaxTests")
&& (
// Start with undeclared identifier errors as they're basic type errors
src.contains("Undeclared identifier")
);

let code = if let Some(expected_error) = expected_error {
// Expect failure only for parser errors, otherwise ignore exit code.
if expected_error.solc_kind.is_some_and(|kind| kind.is_parser_error()) {
// Expect failure for parser errors or TypeError when typechecking enabled
if expected_error.solc_kind.is_some_and(|kind| kind.is_parser_error())
|| (has_type_errors
&& expected_error
.solc_kind
.is_some_and(|kind| matches!(kind, crate::solc::SolcErrorKind::TypeError)))
{
Some(1)
} else {
None
Expand All @@ -226,6 +242,13 @@ fn solc_per_file_config(config: &mut ui_test::Config, src: &str, path: &Path, cf

if matches!(cfg.mode, Mode::SolcSolidity) {
let flags = &mut config.comment_defaults.base().compile_flags;

// Enable typechecking for qualifying TypeError tests
if has_type_errors {
config.program.args.retain(|arg| arg != "--stop-after=parsing");
flags.push("-Ztypeck".into());
}

let has_delimiters = solc::solidity::handle_delimiters(src, path, cfg.tmp_dir, |arg| {
flags.push(arg.into_string().unwrap())
});
Expand Down
Loading