diff --git a/.gitignore b/.gitignore index 23e9ce434bad4..b6d6d2aa718af 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,6 @@ package-lock.json # Tools ## Kani *.out -kani-list.* # Added by cargo # diff --git a/scripts/run-kani.sh b/scripts/run-kani.sh index a86526d3fc0e1..234b2fda9e0f3 100755 --- a/scripts/run-kani.sh +++ b/scripts/run-kani.sh @@ -297,18 +297,19 @@ main() { echo "Running Kani list command..." "$kani_path" list -Z list $unstable_args ./library --std --format markdown elif [[ "$run_command" == "metrics" ]]; then - echo "Computing Kani-specific metrics..." + local current_dir=$(pwd) echo "Running Kani list command..." "$kani_path" list -Z list $unstable_args ./library --std --format json - mv $(pwd)/kani-list.json scripts/kani-std-analysis/kani-list.json echo "Running Kani's std-analysis command..." pushd $build_dir ./scripts/std-analysis.sh popd pushd scripts/kani-std-analysis pip install -r requirements.txt - ./kani_std_analysis.py + echo "Computing Kani-specific metrics..." + ./kani_std_analysis.py --kani-list-file $current_dir/kani-list.json popd + rm kani-list.json fi }