1 files changed, 3 insertions, 7 deletions
diff --git a/lib/sanitizer_common/tests/sanitizer_flags_test.cc b/lib/sanitizer_common/tests/sanitizer_flags_test.cc
index 4b273e5b9cef..c0589f4d2e90 100644
--- a/lib/sanitizer_common/tests/sanitizer_flags_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_flags_test.cc
@@ -12,11 +12,9 @@
 //===----------------------------------------------------------------------===//
 #include "sanitizer_common/sanitizer_common.h"
 #include "sanitizer_common/sanitizer_flags.h"
+#include "sanitizer_common/sanitizer_libc.h"
 #include "gtest/gtest.h"
 
-#include "tsan_rtl.h"  // FIXME: break dependency from TSan runtime.
-using __tsan::ScopedInRtl;
-
 #include <string.h>
 
 namespace __sanitizer {
@@ -34,11 +32,10 @@ static void TestStrFlag(const char *start_value, const char *env,
                         const char *final_value) {
   const char *flag = start_value;
   ParseFlag(env, &flag, kFlagName);
-  EXPECT_STREQ(final_value, flag);
+  EXPECT_EQ(internal_strcmp(final_value, flag), 0);
 }
 
 TEST(SanitizerCommon, BooleanFlags) {
-  ScopedInRtl in_rtl;
   TestFlag(true, "--flag_name", true);
   TestFlag(false, "flag_name", false);
   TestFlag(false, "--flag_name=1", true);
@@ -51,7 +48,6 @@ TEST(SanitizerCommon, BooleanFlags) {
 }
 
 TEST(SanitizerCommon, IntFlags) {
-  ScopedInRtl in_rtl;
   TestFlag(-11, 0, -11);
   TestFlag(-11, "flag_name", 0);
   TestFlag(-11, "--flag_name=", 0);
@@ -60,12 +56,12 @@ TEST(SanitizerCommon, IntFlags) {
 }
 
 TEST(SanitizerCommon, StrFlags) {
-  ScopedInRtl in_rtl;
   TestStrFlag("zzz", 0, "zzz");
   TestStrFlag("zzz", "flag_name", "");
   TestStrFlag("zzz", "--flag_name=", "");
   TestStrFlag("", "--flag_name=abc", "abc");
   TestStrFlag("", "--flag_name='abc zxc'", "abc zxc");
+  TestStrFlag("", "--flag_name='abc zxcc'", "abc zxcc");
   TestStrFlag("", "--flag_name=\"abc qwe\" asd", "abc qwe");
 }