[asan] added a test to check that a global-buffer-overflow mentioned the module name; revert incorrect change in the test runner

llvm-svn: 146701

2 files changed, 9 insertions, 2 deletions

diff --git a/compiler-rt/lib/asan/tests/asan_test.cc b/compiler-rt/lib/asan/tests/asan_test.cc
index c302b8317cf..b1ac647c1ab 100644
--- a/compiler-rt/lib/asan/tests/asan_test.cc
+++ b/compiler-rt/lib/asan/tests/asan_test.cc
@@ -1577,6 +1577,13 @@ TEST(AddressSanitizer, GlobalStringConstTest) {
   EXPECT_DEATH(Ident(p[15]), "is ascii string 'FOOBAR123'");
 }
 
+TEST(AddressSanitizer, FileNameInGlobalReportTest) {
+  static char zoo[10];
+  const char *p = Ident(zoo);
+  // The file name should be present in the report.
+  EXPECT_DEATH(Ident(p[15]), "zoo.*asan_test.cc");
+}
+
 int *ReturnsPointerToALocalObject() {
   int a = 0;
   return Ident(&a);
diff --git a/compiler-rt/lib/asan/tests/test_output.sh b/compiler-rt/lib/asan/tests/test_output.sh
index 433d94fb89f..75e0c5ed29b 100755
--- a/compiler-rt/lib/asan/tests/test_output.sh
+++ b/compiler-rt/lib/asan/tests/test_output.sh
@@ -38,8 +38,8 @@ for t in  *.tmpl; do
         actual_t="$t"
       fi
       ./$exe 2>&1 | $SYMBOLIZER 2> /dev/null | c++filt | ./match_output.py $actual_t
-      #rm ./$exe
-      #[ -e "$so" ] && rm ./$so
+      rm ./$exe
+      [ -e "$so" ] && rm ./$so
     done
   done
 done