From 4b9b3fea10671fee38a55852d283d8489d7965a6 Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Mon, 7 Aug 2023 16:48:30 +0100 Subject: [PATCH] chore: fix acir-tests (#1435) Please provide a paragraph or two giving a summary of the change, including relevant motivation and context. # Checklist: Remove the checklist to signal you've completed it. Enable auto-merge if the PR is ready to merge. - [ ] If the pull request requires a cryptography review (e.g. cryptographic algorithm implementations) I have added the 'crypto' tag. - [ ] I have reviewed my diff in github, line by line and removed unexpected formatting changes, testing logs, or commented-out code. - [ ] Every change is related to the PR description. - [ ] I have [linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) this pull request to relevant issues (if any exist). --- .../barretenberg/acir_tests/run_acir_tests.sh | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh b/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh index f6029828b91..f80da051b99 100755 --- a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh +++ b/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh @@ -18,39 +18,23 @@ if [ ! -d acir_tests ]; then git clone -b $BRANCH --filter=blob:none --no-checkout https://github.com/noir-lang/noir.git cd noir git sparse-checkout init --cone - git sparse-checkout set crates/nargo_cli/tests/test_data + git sparse-checkout set crates/nargo_cli/tests/execution_success git checkout cd .. - mv noir/crates/nargo_cli/tests/test_data acir_tests + mv noir/crates/nargo_cli/tests/execution_success acir_tests rm -rf noir fi fi cd acir_tests -# Parse exclude and fail directories from cargo.toml -exclude_dirs=$(grep "^exclude" config.toml | sed 's/exclude = \[//;s/\]//;s/\"//g;s/ //g' | tr ',' '\n') -fail_dirs=$(grep "^fail" config.toml | sed 's/fail = \[//;s/\]//;s/\"//g;s/ //g' | tr ',' '\n') - # Convert them to array -exclude_array=($exclude_dirs) -fail_array=($fail_dirs) skip_array=(diamond_deps_0 workspace workspace_default_member) function test() { echo -n "Testing $1... " dir_name=$(basename "$1") - if [[ " ${exclude_array[@]} " =~ " $dir_name " ]]; then - echo -e "\033[33mSKIPPED\033[0m (excluded)" - return - fi - - if [[ " ${fail_array[@]} " =~ " $dir_name " ]]; then - echo -e "\033[33mSKIPPED\033[0m (would fail)" - return - fi - if [[ " ${skip_array[@]} " =~ " $dir_name " ]]; then echo -e "\033[33mSKIPPED\033[0m (hardcoded to skip)" return