omit rather than skip tsan-only small-locks tests

Summary: There are some tests which intentionally deadlock and which are intended to cause thread sanitizer to trap. Omit them rather than skip in all other build modes.

Reviewed By: dmm-fb

Differential Revision: D76613045

fbshipit-source-id: 67531375f4d7357762e890a554fd5d852528a87a

Author: yfeldblum

third-party/folly/src/folly/synchronization/test/SmallLocksTest.cpp

@@ -179,9 +179,9 @@ TEST(SmallLocks, PicoSpinSigned) {
   EXPECT_EQ(val.getData(), -8);
 }
 
-TEST(SmallLocks, PicoSpinLockThreadSanitizer) {
-  SKIP_IF(!folly::kIsSanitizeThread) << "Enabled in TSAN mode only";
+#if FOLLY_SANITIZE_THREAD
 
+TEST(SmallLocks, PicoSpinLockThreadSanitizer) {
   typedef PicoSpinLock<int16_t, 0> Lock;
 
   {
@@ -207,6 +207,8 @@ TEST(SmallLocks, PicoSpinLockThreadSanitizer) {
   }
 }
 
+#endif
+
 TEST(SmallLocks, RegClobber) {
   TestClobber().go();
 }
@@ -439,9 +441,9 @@ TEST(SmallLocks, MicroSpinLockStressTestTryLockHardwareConcurrency) {
   simpleStressTestTryLock<MicroSpinLock>(duration, threads);
 }
 
-TEST(SmallLocksk, MicroSpinLockThreadSanitizer) {
-  SKIP_IF(!folly::kIsSanitizeThread) << "Enabled in TSAN mode only";
+#if FOLLY_SANITIZE_THREAD
 
+TEST(SmallLocks, MicroSpinLockThreadSanitizer) {
   uint8_t val = 0;
   static_assert(sizeof(uint8_t) == sizeof(MicroSpinLock), "sanity check");
   // make sure TSAN handles this case too:
@@ -497,6 +499,8 @@ TEST(SmallLocksk, MicroSpinLockThreadSanitizer) {
   }
 }
 
+#endif
+
 TEST(SmallLocks, PicoSpinLockStressTestTryLockTwoThreads) {
   auto duration = std::chrono::seconds{FLAGS_stress_test_seconds};
   simpleStressTestTryLock<PicoSpinLock<std::uint16_t>>(duration, 2);