noir-lang · TomAFrench · Mar 14, 2024 · Mar 14, 2024
diff --git a/test_programs/compile_failure/brillig_nested_slices/Prover.toml b/test_programs/compile_failure/brillig_nested_slices/Prover.toml
diff --git a/test_programs/compile_failure/custom_entry_not_found/Prover.toml b/test_programs/compile_failure/custom_entry_not_found/Prover.toml
diff --git a/test_programs/compile_failure/dep_impl_primitive/Prover.toml b/test_programs/compile_failure/dep_impl_primitive/Prover.toml
diff --git a/test_programs/compile_failure/depend_on_bin/Prover.toml b/test_programs/compile_failure/depend_on_bin/Prover.toml
diff --git a/test_programs/compile_failure/div_by_zero_modulo/Prover.toml b/test_programs/compile_failure/div_by_zero_modulo/Prover.toml
diff --git a/test_programs/compile_failure/dup_trait_implementation_4/Prover.toml b/test_programs/compile_failure/dup_trait_implementation_4/Prover.toml
diff --git a/test_programs/compile_failure/dup_trait_implementation_5/Prover.toml b/test_programs/compile_failure/dup_trait_implementation_5/Prover.toml
diff --git a/test_programs/compile_failure/dup_trait_items_1/Prover.toml b/test_programs/compile_failure/dup_trait_items_1/Prover.toml
diff --git a/test_programs/compile_failure/dup_trait_items_2/Prover.toml b/test_programs/compile_failure/dup_trait_items_2/Prover.toml
diff --git a/test_programs/compile_failure/dup_trait_items_3/Prover.toml b/test_programs/compile_failure/dup_trait_items_3/Prover.toml
diff --git a/test_programs/compile_failure/dup_trait_items_4/Prover.toml b/test_programs/compile_failure/dup_trait_items_4/Prover.toml
diff --git a/test_programs/compile_failure/dup_trait_items_5/Prover.toml b/test_programs/compile_failure/dup_trait_items_5/Prover.toml
diff --git a/test_programs/compile_failure/dup_trait_items_6/Prover.toml b/test_programs/compile_failure/dup_trait_items_6/Prover.toml
diff --git a/test_programs/compile_failure/hashmap_load_factor/Prover.toml b/test_programs/compile_failure/hashmap_load_factor/Prover.toml
diff --git a/test_programs/compile_failure/negate_unsigned/Prover.toml b/test_programs/compile_failure/negate_unsigned/Prover.toml
diff --git a/test_programs/compile_failure/orphaned_trait_impl/Prover.toml b/test_programs/compile_failure/orphaned_trait_impl/Prover.toml
diff --git a/test_programs/compile_failure/slice_remove_failure/Prover.toml b/test_programs/compile_failure/slice_remove_failure/Prover.toml
diff --git a/test_programs/compile_failure/workspace_missing_toml/crates/a/Prover.toml b/test_programs/compile_failure/workspace_missing_toml/crates/a/Prover.toml
diff --git a/test_programs/compile_failure/workspace_missing_toml/crates/b/Prover.toml b/test_programs/compile_failure/workspace_missing_toml/crates/b/Prover.toml
diff --git a/...ile_failure/assert_msg_runtime/Nargo.toml → ...ion_failure/assert_msg_runtime/Nargo.toml b/...ile_failure/assert_msg_runtime/Nargo.toml → ...ion_failure/assert_msg_runtime/Nargo.toml
diff --git a/...le_failure/assert_msg_runtime/Prover.toml → ...on_failure/assert_msg_runtime/Prover.toml b/...le_failure/assert_msg_runtime/Prover.toml → ...on_failure/assert_msg_runtime/Prover.toml
diff --git a/...le_failure/assert_msg_runtime/src/main.nr → ...on_failure/assert_msg_runtime/src/main.nr b/...le_failure/assert_msg_runtime/src/main.nr → ...on_failure/assert_msg_runtime/src/main.nr
diff --git a/...le_failure/brillig_assert_fail/Nargo.toml → ...on_failure/brillig_assert_fail/Nargo.toml b/...le_failure/brillig_assert_fail/Nargo.toml → ...on_failure/brillig_assert_fail/Nargo.toml
diff --git a/...e_failure/brillig_assert_fail/Prover.toml → ...n_failure/brillig_assert_fail/Prover.toml b/...e_failure/brillig_assert_fail/Prover.toml → ...n_failure/brillig_assert_fail/Prover.toml
diff --git a/...e_failure/brillig_assert_fail/src/main.nr → ...n_failure/brillig_assert_fail/src/main.nr b/...e_failure/brillig_assert_fail/src/main.nr → ...n_failure/brillig_assert_fail/src/main.nr
diff --git a/...ure/brillig_assert_msg_runtime/Nargo.toml → ...ure/brillig_assert_msg_runtime/Nargo.toml b/...ure/brillig_assert_msg_runtime/Nargo.toml → ...ure/brillig_assert_msg_runtime/Nargo.toml
diff --git a/...re/brillig_assert_msg_runtime/Prover.toml → ...re/brillig_assert_msg_runtime/Prover.toml b/...re/brillig_assert_msg_runtime/Prover.toml → ...re/brillig_assert_msg_runtime/Prover.toml
diff --git a/...re/brillig_assert_msg_runtime/src/main.nr → ...re/brillig_assert_msg_runtime/src/main.nr b/...re/brillig_assert_msg_runtime/src/main.nr → ...re/brillig_assert_msg_runtime/src/main.nr
diff --git a/..._failure/div_by_zero_constants/Nargo.toml → ..._failure/div_by_zero_constants/Nargo.toml b/..._failure/div_by_zero_constants/Nargo.toml → ..._failure/div_by_zero_constants/Nargo.toml
diff --git a/...ms/compile_failure/cyclic_dep/Prover.toml → ...failure/div_by_zero_constants/Prover.toml b/...ms/compile_failure/cyclic_dep/Prover.toml → ...failure/div_by_zero_constants/Prover.toml
diff --git a/...failure/div_by_zero_constants/src/main.nr → ...failure/div_by_zero_constants/src/main.nr b/...failure/div_by_zero_constants/src/main.nr → ...failure/div_by_zero_constants/src/main.nr
diff --git a/...ile_failure/div_by_zero_modulo/Nargo.toml → ...ion_failure/div_by_zero_modulo/Nargo.toml b/...ile_failure/div_by_zero_modulo/Nargo.toml → ...ion_failure/div_by_zero_modulo/Nargo.toml
diff --git a/...failure/div_by_zero_constants/Prover.toml → ...on_failure/div_by_zero_modulo/Prover.toml b/...failure/div_by_zero_constants/Prover.toml → ...on_failure/div_by_zero_modulo/Prover.toml
diff --git a/...le_failure/div_by_zero_modulo/src/main.nr → ...on_failure/div_by_zero_modulo/src/main.nr b/...le_failure/div_by_zero_modulo/src/main.nr → ...on_failure/div_by_zero_modulo/src/main.nr
diff --git a/.../div_by_zero_numerator_witness/Nargo.toml → .../div_by_zero_numerator_witness/Nargo.toml b/.../div_by_zero_numerator_witness/Nargo.toml → .../div_by_zero_numerator_witness/Nargo.toml
diff --git a/...div_by_zero_numerator_witness/Prover.toml → ...div_by_zero_numerator_witness/Prover.toml b/...div_by_zero_numerator_witness/Prover.toml → ...div_by_zero_numerator_witness/Prover.toml
diff --git a/...div_by_zero_numerator_witness/src/main.nr → ...div_by_zero_numerator_witness/src/main.nr b/...div_by_zero_numerator_witness/src/main.nr → ...div_by_zero_numerator_witness/src/main.nr
diff --git a/...le_failure/div_by_zero_witness/Nargo.toml → ...on_failure/div_by_zero_witness/Nargo.toml b/...le_failure/div_by_zero_witness/Nargo.toml → ...on_failure/div_by_zero_witness/Nargo.toml
diff --git a/...e_failure/div_by_zero_witness/Prover.toml → ...n_failure/div_by_zero_witness/Prover.toml b/...e_failure/div_by_zero_witness/Prover.toml → ...n_failure/div_by_zero_witness/Prover.toml
diff --git a/...e_failure/div_by_zero_witness/src/main.nr → ...n_failure/div_by_zero_witness/src/main.nr b/...e_failure/div_by_zero_witness/src/main.nr → ...n_failure/div_by_zero_witness/src/main.nr
diff --git a/...re/dyn_index_fail_nested_array/Nargo.toml → ...re/dyn_index_fail_nested_array/Nargo.toml b/...re/dyn_index_fail_nested_array/Nargo.toml → ...re/dyn_index_fail_nested_array/Nargo.toml
diff --git a/...e/dyn_index_fail_nested_array/Prover.toml → ...e/dyn_index_fail_nested_array/Prover.toml b/...e/dyn_index_fail_nested_array/Prover.toml → ...e/dyn_index_fail_nested_array/Prover.toml
diff --git a/...e/dyn_index_fail_nested_array/src/main.nr → ...e/dyn_index_fail_nested_array/src/main.nr b/...e/dyn_index_fail_nested_array/src/main.nr → ...e/dyn_index_fail_nested_array/src/main.nr
diff --git a/..._failure/dynamic_index_failure/Nargo.toml → ..._failure/dynamic_index_failure/Nargo.toml b/..._failure/dynamic_index_failure/Nargo.toml → ..._failure/dynamic_index_failure/Nargo.toml
diff --git a/...failure/dynamic_index_failure/Prover.toml → ...failure/dynamic_index_failure/Prover.toml b/...failure/dynamic_index_failure/Prover.toml → ...failure/dynamic_index_failure/Prover.toml
diff --git a/...failure/dynamic_index_failure/src/main.nr → ...failure/dynamic_index_failure/src/main.nr b/...failure/dynamic_index_failure/src/main.nr → ...failure/dynamic_index_failure/src/main.nr
diff --git a/.../compile_failure/option_expect/Nargo.toml → ...xecution_failure/option_expect/Nargo.toml b/.../compile_failure/option_expect/Nargo.toml → ...xecution_failure/option_expect/Nargo.toml
diff --git a/...compile_failure/option_expect/src/main.nr → ...ecution_failure/option_expect/src/main.nr b/...compile_failure/option_expect/src/main.nr → ...ecution_failure/option_expect/src/main.nr
diff --git a/...e_failure/slice_access_failure/Nargo.toml → ...n_failure/slice_access_failure/Nargo.toml b/...e_failure/slice_access_failure/Nargo.toml → ...n_failure/slice_access_failure/Nargo.toml
diff --git a/...ure/radix_non_constant_length/Prover.toml → ..._failure/slice_access_failure/Prover.toml b/...ure/radix_non_constant_length/Prover.toml → ..._failure/slice_access_failure/Prover.toml
diff --git a/..._failure/slice_access_failure/src/main.nr → ..._failure/slice_access_failure/src/main.nr b/..._failure/slice_access_failure/src/main.nr → ..._failure/slice_access_failure/src/main.nr
diff --git a/...e_failure/slice_insert_failure/Nargo.toml → ...n_failure/slice_insert_failure/Nargo.toml b/...e_failure/slice_insert_failure/Nargo.toml → ...n_failure/slice_insert_failure/Nargo.toml
diff --git a/..._failure/slice_access_failure/Prover.toml → ..._failure/slice_insert_failure/Prover.toml b/..._failure/slice_access_failure/Prover.toml → ..._failure/slice_insert_failure/Prover.toml
diff --git a/..._failure/slice_insert_failure/src/main.nr → ..._failure/slice_insert_failure/src/main.nr b/..._failure/slice_insert_failure/src/main.nr → ..._failure/slice_insert_failure/src/main.nr
diff --git a/...e_failure/slice_remove_failure/Nargo.toml → ...n_failure/slice_remove_failure/Nargo.toml b/...e_failure/slice_remove_failure/Nargo.toml → ...n_failure/slice_remove_failure/Nargo.toml
diff --git a/..._failure/slice_insert_failure/Prover.toml → ..._failure/slice_remove_failure/Prover.toml b/..._failure/slice_insert_failure/Prover.toml → ..._failure/slice_remove_failure/Prover.toml
diff --git a/..._failure/slice_remove_failure/src/main.nr → ..._failure/slice_remove_failure/src/main.nr b/..._failure/slice_remove_failure/src/main.nr → ..._failure/slice_remove_failure/src/main.nr
diff --git a/...compile_failure/workspace_fail/Nargo.toml → ...ecution_failure/workspace_fail/Nargo.toml b/...compile_failure/workspace_fail/Nargo.toml → ...ecution_failure/workspace_fail/Nargo.toml
diff --git a/...ailure/workspace_fail/crates/a/Nargo.toml → ...ailure/workspace_fail/crates/a/Nargo.toml b/...ailure/workspace_fail/crates/a/Nargo.toml → ...ailure/workspace_fail/crates/a/Nargo.toml
diff --git a/...ilure/workspace_fail/crates/a/Prover.toml → ...ilure/workspace_fail/crates/a/Prover.toml b/...ilure/workspace_fail/crates/a/Prover.toml → ...ilure/workspace_fail/crates/a/Prover.toml
diff --git a/...ilure/workspace_fail/crates/a/src/main.nr → ...ilure/workspace_fail/crates/a/src/main.nr b/...ilure/workspace_fail/crates/a/src/main.nr → ...ilure/workspace_fail/crates/a/src/main.nr
diff --git a/...ailure/workspace_fail/crates/b/Nargo.toml → ...ailure/workspace_fail/crates/b/Nargo.toml b/...ailure/workspace_fail/crates/b/Nargo.toml → ...ailure/workspace_fail/crates/b/Nargo.toml
diff --git a/...ilure/workspace_fail/crates/b/Prover.toml → ...ilure/workspace_fail/crates/b/Prover.toml b/...ilure/workspace_fail/crates/b/Prover.toml → ...ilure/workspace_fail/crates/b/Prover.toml
diff --git a/...ilure/workspace_fail/crates/b/src/main.nr → ...ilure/workspace_fail/crates/b/src/main.nr b/...ilure/workspace_fail/crates/b/src/main.nr → ...ilure/workspace_fail/crates/b/src/main.nr
diff --git a/tooling/nargo_cli/build.rs b/tooling/nargo_cli/build.rs
@@ -41,6 +41,7 @@ fn main() {
     println!("cargo:rerun-if-changed={}", test_dir.as_os_str().to_str().unwrap());
 
     generate_execution_success_tests(&mut test_file, &test_dir);
+    generate_execution_failure_tests(&mut test_file, &test_dir);
     generate_noir_test_success_tests(&mut test_file, &test_dir);
     generate_noir_test_failure_tests(&mut test_file, &test_dir);
     generate_compile_success_empty_tests(&mut test_file, &test_dir);
@@ -86,6 +87,44 @@ fn execution_success_{test_name}() {{
     }
 }
 
+fn generate_execution_failure_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_sub_dir = "execution_failure";
+    let test_data_dir = test_data_dir.join(test_sub_dir);
+
+    let test_case_dirs =
+        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+
+    for test_dir in test_case_dirs {
+        let test_name =
+            test_dir.file_name().into_string().expect("Directory can't be converted to string");
+        if test_name.contains('-') {
+            panic!(
+                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
+            );
+        };
+        let test_dir = &test_dir.path();
+
+        write!(
+            test_file,
+            r#"
+#[test]
+fn execution_failure_{test_name}() {{
+    let test_program_dir = PathBuf::from("{test_dir}");
+
+    let mut cmd = Command::cargo_bin("nargo").unwrap();
+    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
+    cmd.arg("--program-dir").arg(test_program_dir);
+    cmd.arg("execute").arg("--force");
+
+    cmd.assert().failure().stderr(predicate::str::contains("The application panicked (crashed).").not());
+}}
+            "#,
+            test_dir = test_dir.display(),
+        )
+        .expect("Could not write templated test file.");
+    }
+}
+
 fn generate_noir_test_success_tests(test_file: &mut File, test_data_dir: &Path) {
     let test_sub_dir = "noir_test_success";
     let test_data_dir = test_data_dir.join(test_sub_dir);
@@ -281,7 +320,7 @@ fn compile_failure_{test_name}() {{
     let mut cmd = Command::cargo_bin("nargo").unwrap();
     cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
     cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("execute").arg("--force");
+    cmd.arg("compile").arg("--force");
 
     cmd.assert().failure().stderr(predicate::str::contains("The application panicked (crashed).").not());
 }}