From 632f5ec0cba263eef8f1779551f3b65cb35ee560 Mon Sep 17 00:00:00 2001
From: Catena cyber <35799796+catenacyber@users.noreply.github.com>
Date: Tue, 9 Mar 2021 21:57:46 +0100
Subject: Rust coverage : source remap after changing dir (#5345)

---
 infra/base-images/base-builder/cargo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'infra')

diff --git a/infra/base-images/base-builder/cargo b/infra/base-images/base-builder/cargo
index 57daea49f..79233b600 100755
--- a/infra/base-images/base-builder/cargo
+++ b/infra/base-images/base-builder/cargo
@@ -31,13 +31,13 @@ fi
 
 if [ "$SANITIZER" = "coverage" ] && [ $1 = "fuzz" ]
 then
-    fuzz_src_abspath=`pwd`
-    export RUSTFLAGS="$RUSTFLAGS --remap-path-prefix fuzz_targets=$fuzz_src_abspath/fuzz_targets"
     # hack to turn cargo fuzz build into cargo build so as to get coverage
     # cargo fuzz adds "--target" "x86_64-unknown-linux-gnu"
     (
     # go into fuzz directory if not already the case
     cd fuzz || true
+    fuzz_src_abspath=`pwd`
+    export RUSTFLAGS="$RUSTFLAGS --remap-path-prefix fuzz_targets=$fuzz_src_abspath/fuzz_targets"
     # do not optimize with --release, leading to Malformed instrumentation profile data
     cargo build --bins
     # copies the build output in the expected target directory
-- 
cgit v1.2.3