Skip to content

Commit

Permalink
Fixes for address sanitizer tests
Browse files Browse the repository at this point in the history
track_caller is unstable and seems to now be guarded behind a feature flag:
rust-lang/rust#74042

We also have one test for large objects that is very slow under ASan.
  • Loading branch information
jamesbornholt committed Nov 18, 2022
1 parent 72dc7f0 commit e257d71
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ test-asan:
@packages=`echo "$(CRATES)" | sed -E 's/(^| )/ -p /g'`; \
LSAN_OPTIONS=suppressions="$$(pwd)/lsan-suppressions.txt" \
RUSTFLAGS="-Zsanitizer=address" \
cargo +nightly test -Z build-std --target x86_64-unknown-linux-gnu --features $(RUST_FEATURES) $$packages -- --skip reftest_ --skip proptest_
cargo +nightly test -Z build-std --target x86_64-unknown-linux-gnu --features $(RUST_FEATURES) $$packages -- \
--skip reftest_ \
--skip proptest_ \
--skip sequential_read_large

.PHONY: fmt
fmt:
Expand Down
1 change: 0 additions & 1 deletion s3-client/src/mock_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,6 @@ mod tests {

use super::*;

#[track_caller]
async fn test_get_object(key: &str, size: usize, range: Option<Range<u64>>) {
let mut rng = ChaChaRng::seed_from_u64(0x12345678);

Expand Down
1 change: 0 additions & 1 deletion s3-client/tests/get_object.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use futures::{pin_mut, Stream};
use s3_client::{GetObjectError, ObjectClient, S3Client, S3RequestError};
use std::ops::Range;

#[track_caller]
async fn check_get_result(
result: impl Stream<Item = Result<(u64, Box<[u8]>), S3RequestError<GetObjectError>>>,
range: Option<Range<u64>>,
Expand Down

0 comments on commit e257d71

Please sign in to comment.