[compiler-rt] r178229 - Fix unmatching ASan runtime flag for init-order checking exposed by r178158. Add a test for r178158.

[Alexey Samsonov]

Author: samsonov
Date: Thu Mar 28 04:11:20 2013
New Revision: 178229

URL: http://llvm.org/viewvc/llvm-project?rev=178229&view=rev
Log:
Fix unmatching ASan runtime flag for init-order checking exposed by r178158. Add a test for r178158.

Modified:
    compiler-rt/trunk/lib/asan/asan_rtl.cc
    compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_flags_test.cc

Modified: compiler-rt/trunk/lib/asan/asan_rtl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=178229&r1=178228&r2=178229&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_rtl.cc Thu Mar 28 04:11:20 2013
@@ -96,7 +96,7 @@ static void ParseFlagsFromString(Flags *
 
   ParseFlag(str, &f->debug, "debug");
   ParseFlag(str, &f->report_globals, "report_globals");
-  ParseFlag(str, &f->check_initialization_order, "initialization_order");
+  ParseFlag(str, &f->check_initialization_order, "check_initialization_order");
   ParseFlag(str, &f->malloc_context_size, "malloc_context_size");
   CHECK((uptr)f->malloc_context_size <= kStackTraceMax);
 

Modified: compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_flags_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_flags_test.cc?rev=178229&r1=178228&r2=178229&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_flags_test.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_flags_test.cc Thu Mar 28 04:11:20 2013
@@ -63,6 +63,7 @@ TEST(SanitizerCommon, StrFlags) {
   TestStrFlag("", "--flag_name='abc zxc'", "abc zxc");
   TestStrFlag("", "--flag_name='abc zxcc'", "abc zxcc");
   TestStrFlag("", "--flag_name=\"abc qwe\" asd", "abc qwe");
+  TestStrFlag("", "other_flag_name=zzz", "");
 }
 
 static void TestTwoFlags(const char *env, bool expected_flag1,