Skip to content

Commit fb36700

Browse files
committed
Fixes for address sanitizer tests
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.
1 parent 72dc7f0 commit fb36700

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ test-asan:
3737
@packages=`echo "$(CRATES)" | sed -E 's/(^| )/ -p /g'`; \
3838
LSAN_OPTIONS=suppressions="$$(pwd)/lsan-suppressions.txt" \
3939
RUSTFLAGS="-Zsanitizer=address" \
40-
cargo +nightly test -Z build-std --target x86_64-unknown-linux-gnu --features $(RUST_FEATURES) $$packages -- --skip reftest_ --skip proptest_
40+
cargo +nightly test -Z build-std --target x86_64-unknown-linux-gnu --features $(RUST_FEATURES) $$packages -- \
41+
--skip reftest_ \
42+
--skip proptest_ \
43+
--skip sequential_read_large
4144

4245
.PHONY: fmt
4346
fmt:

s3-client/src/mock_client.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,6 @@ mod tests {
359359

360360
use super::*;
361361

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

s3-client/tests/get_object.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use futures::{pin_mut, Stream};
1010
use s3_client::{GetObjectError, ObjectClient, S3Client, S3RequestError};
1111
use std::ops::Range;
1212

13-
#[track_caller]
1413
async fn check_get_result(
1514
result: impl Stream<Item = Result<(u64, Box<[u8]>), S3RequestError<GetObjectError>>>,
1615
range: Option<Range<u64>>,

0 commit comments

Comments
 (0)