diff options
| author |  Catena cyber <35799796+catenacyber@users.noreply.github.com> | 2021-03-12 17:52:54 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-03-12 08:52:54 -0800 |
| commit | be203e38a556a1f4348050061db7ee394649a531 (patch) | |
| tree | 145e3eb8680c8c4ce3fe167e51f5bf9fea59636a /infra/base-images/base-builder/cargo | |
| parent | 98e30c07a05740a16467426b3a548ef6aa7d9e6e (diff) | |
More generic target directory for rust coverage (#5366)
* More generic target directory for rust coverage
* Rust coverage cargo does not change PATH
Diffstat (limited to 'infra/base-images/base-builder/cargo')
| -rwxr-xr-x | infra/base-images/base-builder/cargo | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/infra/base-images/base-builder/cargo b/infra/base-images/base-builder/cargo index 79233b60..670c8193 100755 --- a/infra/base-images/base-builder/cargo +++ b/infra/base-images/base-builder/cargo @@ -21,8 +21,6 @@ # ################################################################################ -export PATH="/rust/bin:$PATH" - if [ "$SANITIZER" = "coverage" ] && [ $1 = "build" ] then crate_src_abspath=`cargo metadata --no-deps --format-version 1 | jq -r '.workspace_root'` @@ -41,11 +39,11 @@ then # do not optimize with --release, leading to Malformed instrumentation profile data cargo build --bins # copies the build output in the expected target directory - cd target + cd `cargo metadata --format-version 1 --no-deps | jq -r '.target_directory'` mkdir -p x86_64-unknown-linux-gnu/release cp -r debug/* x86_64-unknown-linux-gnu/release/ ) exit 0 fi -cargo "$@" +/rust/bin/cargo "$@" |