From eea4a628cb25e343f7d0a08e4b7f4689af181891 Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Tue, 2 May 2023 00:07:59 +0900
Subject: [PATCH] tests: Use build-context crate for robustness

---
 Cargo.toml          |  1 +
 bench/Cargo.toml    |  1 +
 src/tests/helper.rs | 13 +++++--------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1c15e004..d85d5451 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,6 +66,7 @@ critical-section = { version = "1", optional = true }
 [dev-dependencies]
 test-helper = { path = "tests/helper", features = ["std"] }
 
+build-context = "0.1"
 crossbeam-utils = "0.8"
 fastrand = "1"
 paste = "1"
diff --git a/bench/Cargo.toml b/bench/Cargo.toml
index 9b6ea215..0a5bff5b 100644
--- a/bench/Cargo.toml
+++ b/bench/Cargo.toml
@@ -14,6 +14,7 @@ std = []
 test-helper = { path = "../tests/helper", features = ["std"] }
 
 atomic = "0.5"
+build-context = "0.1"
 criterion = { default-features = false, git = "https://github.com/taiki-e/criterion.rs.git", branch = "dev" } # reduce deps
 crossbeam-utils = "0.8"
 fastrand = "1"
diff --git a/src/tests/helper.rs b/src/tests/helper.rs
index 4c6d5086..97be95e2 100644
--- a/src/tests/helper.rs
+++ b/src/tests/helper.rs
@@ -2060,7 +2060,7 @@ fn skip_should_panic_test() -> bool {
     test_helper::is_panic_abort()
         || cfg!(miri)
         || option_env!("CARGO_PROFILE_RELEASE_LTO").map_or(false, |v| v == "fat")
-            && option_env!("MSAN_OPTIONS").is_some()
+            && build_context::SANITIZE.contains("memory")
 }
 
 // Test the cases that should not fail if the memory ordering is implemented correctly.
@@ -2161,18 +2161,15 @@ macro_rules! __stress_test_seqcst {
     ($atomic_type:ident, $write:ident, $load_order:ident, $store_order:ident) => {{
         use super::*;
         use crossbeam_utils::thread;
-        use std::{
-            env,
-            sync::atomic::{AtomicUsize, Ordering},
-        };
+        use std::sync::atomic::{AtomicUsize, Ordering};
         let n: usize = if cfg!(miri) {
             8
         } else if cfg!(valgrind)
-            || option_env!("ASAN_OPTIONS").is_some()
-            || option_env!("MSAN_OPTIONS").is_some()
+            || build_context::SANITIZE.contains("address")
+            || build_context::SANITIZE.contains("memory")
         {
             50
-        } else if env::var_os("GITHUB_ACTIONS").is_some() && cfg!(not(target_os = "linux")) {
+        } else if option_env!("GITHUB_ACTIONS").is_some() && cfg!(not(target_os = "linux")) {
             // GitHub Actions' macOS and Windows runners are slow.
             5_000
         } else {