From fd17e89b1cf8863228f41c1920739f1627a45990 Mon Sep 17 00:00:00 2001 From: James Bornholt Date: Tue, 12 Mar 2024 22:18:28 +0000 Subject: [PATCH] Run ASan on ARM runners Signed-off-by: James Bornholt --- .github/workflows/integration.yml | 4 ++-- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 5a1c24041..4408d4cfc 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -129,11 +129,11 @@ jobs: asan: name: Address sanitizer - runs-on: ubuntu-22.04 + runs-on: [self-hosted, linux, arm64] environment: ${{ inputs.environment }} - timeout-minutes: 60 + timeout-minutes: 30 steps: - name: Configure AWS credentials diff --git a/Makefile b/Makefile index 42de2907b..07b80f44a 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ test-asan-working: @packages=`echo "$(CRATES)" | sed -E 's/(^| )/ -p /g'`; \ RUSTFLAGS="-Zsanitizer=address" \ RUSTC_BOOTSTRAP=1 \ - cargo test -Z build-std --target x86_64-unknown-linux-gnu --features $(RUST_FEATURES) $$packages -- --ignored test_asan_working 2>&1 \ + cargo test -Z build-std --target `rustc -vV | grep 'host:' | cut -f2 -d' '` --features $(RUST_FEATURES) $$packages -- --ignored test_asan_working 2>&1 \ | tee /dev/stderr \ | grep "heap-use-after-free" \ && echo "ASan is working" || (echo "ASan did not find the use-after-free; something's wrong"; exit 1) @@ -39,7 +39,7 @@ test-asan: LSAN_OPTIONS=suppressions="$$(pwd)/lsan-suppressions.txt" \ RUSTFLAGS="-Zsanitizer=address" \ RUSTC_BOOTSTRAP=1 \ - cargo test -Z build-std --target x86_64-unknown-linux-gnu --features $(RUST_FEATURES) $$packages -- \ + cargo test -Z build-std --target `rustc -vV | grep 'host:' | cut -f2 -d' '` --features $(RUST_FEATURES) $$packages -- \ --skip reftest_ \ --skip proptest_ \ --skip fork_test \