Give path to rustfilt

dacut · Sep 27, 2022 · 4774194 · 4774194
1 parent e59fd1d
commit 4774194
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/coverage-report.sh b/coverage-report.sh
@@ -1,12 +1,14 @@
 #!/bin/bash -ex
 ROOT=$(cd $(dirname $0); pwd)
-llvm-cov report -Xdemangler=rustfilt \
+llvm-cov report \
+    -Xdemangler="$HOME/.cargo/bin/rustfilt" \
     -use-color \
     -ignore-filename-regex='/.cargo/registry|.*thread/local.rs' \
     -instr-profile="$ROOT/arn/cov.profdata" \
     "$ROOT"/target/coverage/arn/debug/deps/scratchstack_arn-[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]
 
-llvm-cov report -Xdemangler=rustfilt \
+llvm-cov report \
+    -Xdemangler="$HOME/.cargo/bin/rustfilt" \
     -use-color \
     -ignore-filename-regex='/.cargo/registry|.*thread/local.rs|arn/' \
     -instr-profile="$ROOT/principal/cov.profdata" \

diff --git a/coverage-run.sh b/coverage-run.sh
@@ -31,12 +31,16 @@ fi
 llvm-profdata merge -sparse "$ROOT"/arn/cov-*.profraw -o "$ROOT/arn/cov.profdata"
 llvm-profdata merge -sparse "$ROOT"/principal/cov-*.profraw -o "$ROOT/principal/cov.profdata"
 
-llvm-cov export -format lcov -Xdemangler=rustfilt -ignore-filename-regex='/.cargo/registry|.*thread/local.rs' \
+llvm-cov export -format lcov \
+    -Xdemangler="$HOME/.cargo/bin/rustfilt" \
+    -ignore-filename-regex='/.cargo/registry|.*thread/local.rs' \
     -instr-profile="$ROOT/arn/cov.profdata" \
     target/coverage/arn/debug/deps/scratchstack_arn-[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9] \
     > "$ROOT/scratchstack-arn.lcov"
 
-llvm-cov export -format lcov -Xdemangler=rustfilt -ignore-filename-regex='/.cargo/registry|.*thread/local.rs|arn/' \
+llvm-cov export -format lcov \
+    -Xdemangler="$HOME/.cargo/bin/rustfilt" \
+    -ignore-filename-regex='/.cargo/registry|.*thread/local.rs|arn/' \
     -instr-profile="$ROOT/principal/cov.profdata" \
     target/coverage/principal/debug/deps/scratchstack_aws_principal-[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9] \
     > "$ROOT/scratchstack-aws-principal.lcov"

diff --git a/coverage-show.sh b/coverage-show.sh
@@ -5,15 +5,15 @@ find "$ROOT/coverage-html" -type f -delete
 llvm-cov show \
     -format=html \
     -ignore-filename-regex='/.cargo/registry|.*thread/local.rs' \
-    -Xdemangler=rustfilt \
+    -Xdemangler="$HOME/.cargo/bin/rustfilt" \
     -output-dir="$ROOT/coverage-html/scratchstack-arn" \
     -instr-profile="$ROOT/arn/cov.profdata" \
     "$ROOT"/target/coverage/arn/debug/deps/scratchstack_arn-[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]
 
 llvm-cov show \
     -format=html \
     -ignore-filename-regex='/.cargo/registry|.*thread/local.rs|arn/' \
-    -Xdemangler=rustfilt \
+    -Xdemangler="$HOME/.cargo/bin/rustfilt" \
     -output-dir="$ROOT/coverage-html/scratchstack-aws-principal" \
     -instr-profile="$ROOT/principal/cov.profdata" \
     "$ROOT"/target/coverage/principal/debug/deps/scratchstack_aws_principal-[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]