[Lldb-commits] [lldb] c413df0 - [lldb-tests] Force use of system stdlib for Objective-C test

Felipe de Azevedo Piovezan via lldb-commits lldb-commits at lists.llvm.org
Mon Oct 24 09:40:07 PDT 2022


Author: Felipe de Azevedo Piovezan
Date: 2022-10-24T12:39:48-04:00
New Revision: c413df064e85623003ae624835177d19a23fffe9

URL: https://github.com/llvm/llvm-project/commit/c413df064e85623003ae624835177d19a23fffe9
DIFF: https://github.com/llvm/llvm-project/commit/c413df064e85623003ae624835177d19a23fffe9.diff

LOG: [lldb-tests] Force use of system stdlib for Objective-C test

The test TestObjCDirectMethods loads the Objective C runtime, which
doesn't work well with custom a libcxx, resulting in two copies of the
standard library being loaded at runtime.

Like what was done for `TestObjCExceptions`, this commit forces the
usage of the system's library instead. The minimum required Clang
version is set to the oldest Clang that can compile the libraries
available in the lldb-matrix bots.

Differential Revision: https://reviews.llvm.org/D136600

Added: 
    

Modified: 
    lldb/test/API/lang/objc/objc_direct-methods/Makefile
    lldb/test/API/lang/objc/objc_direct-methods/TestObjCDirectMethods.py

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/lang/objc/objc_direct-methods/Makefile b/lldb/test/API/lang/objc/objc_direct-methods/Makefile
index afecbf969483e..22567a2e5a6d8 100644
--- a/lldb/test/API/lang/objc/objc_direct-methods/Makefile
+++ b/lldb/test/API/lang/objc/objc_direct-methods/Makefile
@@ -1,4 +1,5 @@
 OBJC_SOURCES := main.m
 LD_EXTRAS := -lobjc -framework Foundation
+USE_SYSTEM_STDLIB := 1
 
 include Makefile.rules

diff  --git a/lldb/test/API/lang/objc/objc_direct-methods/TestObjCDirectMethods.py b/lldb/test/API/lang/objc/objc_direct-methods/TestObjCDirectMethods.py
index 9fbf972ad8ea6..ed89377d9b7ac 100644
--- a/lldb/test/API/lang/objc/objc_direct-methods/TestObjCDirectMethods.py
+++ b/lldb/test/API/lang/objc/objc_direct-methods/TestObjCDirectMethods.py
@@ -1,4 +1,6 @@
 from lldbsuite.test import lldbinline
+from lldbsuite.test import decorators
 
+decor = [decorators.skipIf(compiler="clang", compiler_version=['<', '13.0'])]
 lldbinline.MakeInlineTest(
-    __file__, globals(), [])
+    __file__, globals(), decor)


        


More information about the lldb-commits mailing list