Update CI once again

rust-lang · Oct 6, 2023 · a93f53c · a93f53c
1 parent b477e37
commit a93f53c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/ci-sanitizers.yaml b/.github/workflows/ci-sanitizers.yaml
@@ -13,6 +13,7 @@ on:
 # only one target for now
 env:
   TARGET: x86_64-unknown-linux-gnu
+  RUST_BACKTRACE: full
 
 jobs:
   enable_matrix:
@@ -21,10 +22,8 @@ jobs:
       matrix:
         crate: [core, alloc, std, simd, stdarch]
         sanitizer: [address, memory, thread, cfi, safestack, leak]
-        exclude:
-          # FIXME can't get this to compile because of conflicts with lto
-          # and embed-bitcode
-           - sanitizer: cfi 
+        # exclude:
+           # - sanitizer: cfi 
     name: Test ${{ matrix.crate }} with ${{ matrix.sanitizer }} sanitizer
     runs-on: ubuntu-latest
     steps:

diff --git a/ci-sanitizers-test.sh b/ci-sanitizers-test.sh
@@ -48,8 +48,7 @@ memtag)
 cfi)
     # CFI needs LTO and 1CGU, seems like randomize-layout enables `embed-bitcode=no`
     # which conflicts
-    RUSTFLAGS=${RUSTFLAGS//-Zrandomize-layout/}
-    RUSTFLAGS="${RUSTFLAGS} -Zsanitizer=cfi -Clto -Ccodegen-units=1"
+    RUSTFLAGS="${RUSTFLAGS} -Zsanitizer=cfi -Clto -Cembed-bitcode=yes -Ccodegen-units=1"
     ;;
 kcfi)
     RUSTFLAGS="${RUSTFLAGS} -Zsanitizer=kcfi"

diff --git a/sanitizers-run-test.sh b/sanitizers-run-test.sh
@@ -37,4 +37,4 @@ echo "running test with RUSTFLAGS ${RUSTFLAGS}"
 
 # run test
 cd "./${CRATE}_run_test"
-cargo test "$@"
+cargo test -vvv "$@"