Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion test_programs/compile_failure/depend_on_bin/stderr.txt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

36 changes: 9 additions & 27 deletions tooling/nargo_cli/tests/execute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
}

// Enable enums and ownership as unstable features
nargo.arg("-Zenums");

Check warning on line 63 in tooling/nargo_cli/tests/execute.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (Zenums)

if force_brillig.0 {
{
Expand Down Expand Up @@ -306,33 +306,15 @@
let stderr = remove_noise_lines(stderr);
let stderr = delete_test_program_dir_occurrences(stderr, &test_program_dir);

let stderr_path = test_program_dir.join("stderr.txt");

let expected_stderr = if stderr_path.exists() {
String::from_utf8(fs::read(stderr_path.clone()).unwrap()).unwrap()
} else {
String::new()
};

// Remove any trailing newlines added by some editors
let stderr = stderr.trim();
let expected_stderr = expected_stderr.trim();

if stderr != expected_stderr {
if std::env::var("OVERWRITE_TEST_OUTPUT").is_ok() {
fs::write(stderr_path, stderr.to_string() + "\n").unwrap();
} else {
// If the expected stderr is empty this is likely a new test, so we produce the expected output for next time
if expected_stderr.is_empty() {
fs::write(stderr_path, stderr.to_string() + "\n").unwrap();
}

println!(
"stderr does not match expected output. Expected:\n{expected_stderr}\n\nActual:\n{stderr}"
);
assert_eq!(stderr, expected_stderr);
}
}
let test_name = test_program_dir.file_name().unwrap().to_string_lossy().to_string();
let snapshot_name = "stderr";
insta::with_settings!(
{
snapshot_path => format!("./snapshots/compile_failure/{test_name}")
},
{
insta::assert_snapshot!(snapshot_name, stderr)
})
}

fn nargo_expand_execute(test_program_dir: PathBuf) {
Expand All @@ -342,7 +324,7 @@
nargo.arg("execute").arg("--force").arg("--disable-comptime-printing");

// Enable enums as an unstable feature
nargo.arg("-Zenums");

Check warning on line 327 in tooling/nargo_cli/tests/execute.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (Zenums)

// Enable pedantic solving
nargo.arg("--pedantic-solving");
Expand All @@ -357,7 +339,7 @@
nargo.arg("expand").arg("--force").arg("--disable-comptime-printing");

// Enable enums as an unstable feature
nargo.arg("-Zenums");

Check warning on line 342 in tooling/nargo_cli/tests/execute.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (Zenums)

// Enable pedantic solving
nargo.arg("--pedantic-solving");
Expand All @@ -381,7 +363,7 @@
let temp_dir = tempfile::tempdir().unwrap().into_path();

// Copy everything from the original directory to the new directory
// (because some depdendencies might be there and might be needed for the expanded code to work)

Check warning on line 366 in tooling/nargo_cli/tests/execute.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (depdendencies)
copy_dir_all(test_program_dir.clone(), temp_dir.clone()).unwrap();

// Create a main file for the expanded code
Expand All @@ -396,7 +378,7 @@
nargo.arg("execute").arg("--force").arg("--disable-comptime-printing");

// Enable enums as an unstable feature
nargo.arg("-Zenums");

Check warning on line 381 in tooling/nargo_cli/tests/execute.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (Zenums)

// Enable pedantic solving
nargo.arg("--pedantic-solving");
Expand All @@ -418,7 +400,7 @@
nargo.arg("expand").arg("--force").arg("--disable-comptime-printing");

// Enable enums as an unstable feature
nargo.arg("-Zenums");

Check warning on line 403 in tooling/nargo_cli/tests/execute.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (Zenums)

// Enable pedantic solving
nargo.arg("--pedantic-solving");
Expand All @@ -442,7 +424,7 @@
let temp_dir = tempfile::tempdir().unwrap().into_path();

// Copy everything from the original directory to the new directory
// (because some depdendencies might be there and might be needed for the expanded code to work)

Check warning on line 427 in tooling/nargo_cli/tests/execute.rs

View workflow job for this annotation

GitHub Actions / Code

Unknown word (depdendencies)
copy_dir_all(test_program_dir.clone(), temp_dir.clone()).unwrap();

// Create a main file for the expanded code
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading