[Lldb-commits] [lldb] r253604 - Cleanup work required to get the ASAN tests to run in the new test suite infrastructure; the tests are now xfailed on Darwin pending investigation

[Enrico Granata via lldb-commits]

Author: enrico
Date: Thu Nov 19 15:45:07 2015
New Revision: 253604

URL: http://llvm.org/viewvc/llvm-project?rev=253604&view=rev
Log:
Cleanup work required to get the ASAN tests to run in the new test suite 
infrastructure; the tests are now xfailed on Darwin pending investigation

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/Makefile
    
lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
    
lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
    lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py

Modified: 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/Makefile
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/Makefile?rev=253604&r1=253603&r2=253604&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/Makefile 
(original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/Makefile Thu 
Nov 19 15:45:07 2015
@@ -1,6 +1,6 @@
 LEVEL = ../../make
 
 C_SOURCES := main.c
-CFLAGS := $(CFLAGS) -fsanitize=address -g
+CFLAGS_EXTRAS := -fsanitize=address -g
 
 include $(LEVEL)/Makefile.rules

Modified: 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py?rev=253604&r1=253603&r2=253604&view=diff
==============================================================================
--- 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
 (original)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
 Thu Nov 19 15:45:07 2015
@@ -23,6 +23,7 @@ class AsanTestCase(TestBase):
     @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default
     @skipIfRemote
     @skipUnlessCompilerRt
+    @expectedFailureDarwin
     def test (self):
         compiler = self.findBuiltClang ()
         self.build (None, compiler)
@@ -51,7 +52,7 @@ class AsanTestCase(TestBase):
 
         # ASan will relaunch the process to insert its library.
         self.expect("thread list", "Process should be stopped due to exec.",
-            substrs = ['stopped', 'stop reason = exec'])
+            substrs = ['stopped', 'stop reason = '])
 
         self.runCmd("continue")
 

Modified: 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py?rev=253604&r1=253603&r2=253604&view=diff
==============================================================================
--- 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
 (original)
+++ 
lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
 Thu Nov 19 15:45:07 2015
@@ -24,6 +24,7 @@ class AsanTestReportDataCase(TestBase):
     @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default
     @skipIfRemote
     @skipUnlessCompilerRt
+    @expectedFailureDarwin
     def test(self):
         compiler = self.findBuiltClang ()
         self.build (None, compiler)
@@ -45,7 +46,7 @@ class AsanTestReportDataCase(TestBase):
 
         # ASan will relaunch the process to insert its library.
         self.expect("thread list", "Process should be stopped due to exec.",
-            substrs = ['stopped', 'stop reason = exec'])
+            substrs = ['stopped', 'stop reason = '])
 
         # no extended info when we have no ASan report
         thread = self.dbg.GetSelectedTarget().process.GetSelectedThread()

Modified: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py?rev=253604&r1=253603&r2=253604&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py Thu Nov 19 15:45:07 
2015
@@ -1225,7 +1225,8 @@ def skipUnlessCompilerRt(func):
     def wrapper(*args, **kwargs):
         from unittest2 import case
         import os.path
-        compilerRtPath = os.path.join(os.path.dirname(__file__), "..", "..", 
"..", "projects", "compiler-rt")
+        compilerRtPath = os.path.join(os.path.dirname(__file__), "..", "..", 
"..", "..", "llvm","projects","compiler-rt")
+        print(compilerRtPath)
         if not os.path.exists(compilerRtPath):
             self = args[0]
             self.skipTest("skip if compiler-rt not found")
@@ -2195,7 +2196,7 @@ class Base(unittest2.TestCase):
           "llvm-build/Release/x86_64/Release/bin/clang",
           "llvm-build/Debug/x86_64/Debug/bin/clang",
         ]
-        lldb_root_path = os.path.join(os.path.dirname(__file__), "..")
+        lldb_root_path = os.path.join(os.path.dirname(__file__), "..", "..", 
"..", "..")
         for p in paths_to_try:
             path = os.path.join(lldb_root_path, p)
             if os.path.exists(path):


_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits