[Lldb-commits] [lldb] r343545 - Enable C++ tests to run in the -gmodules configuration on Darwin.

[Adrian Prantl via lldb-commits]

Author: adrian
Date: Mon Oct  1 15:27:42 2018
New Revision: 343545

URL: http://llvm.org/viewvc/llvm-project?rev=343545&view=rev
Log:
Enable C++ tests to run in the -gmodules configuration on Darwin.

This addresses PR36048 (http://llvm.org/bugs/show_bug.cgi?id=36048)

rdar://problem/36776281

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
    lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules

Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py?rev=343545&r1=343544&r2=343545&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py Mon Oct  1 15:27:42 2018
@@ -51,8 +51,6 @@ class LibcxxVectorDataFormatterTestCase(
                     substrs=['1234'])
 
     @add_test_categories(["libc++"])
-    @skipIf(debug_info="gmodules",
-            bugnumber="https://bugs.llvm.org/show_bug.cgi?id=36048")
     def test_with_run_command(self):
         """Test that that file and class static variables display correctly."""
         self.build()
@@ -180,8 +178,6 @@ class LibcxxVectorDataFormatterTestCase(
                     substrs=['vector has 0 items'])
 
     @add_test_categories(["libc++"])
-    @skipIf(debug_info="gmodules",
-            bugnumber="https://bugs.llvm.org/show_bug.cgi?id=36048")
     def test_ref_and_ptr(self):
         """Test that that file and class static variables display correctly."""
         self.build()

Modified: lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules?rev=343545&r1=343544&r2=343545&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules Mon Oct  1 15:27:42 2018
@@ -246,6 +246,10 @@ MANDATORY_MODULE_BUILD_CFLAGS := -fmodul
 
 ifeq "$(MAKE_GMODULES)" "YES"
 	CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS)
+	CXXFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS)
+	ifeq "$(OS)" "Darwin"
+		CXXFLAGS += -fcxx-modules
+	endif
 endif
 
 CXXFLAGS += -std=c++11 $(CFLAGS) $(ARCH_CXXFLAGS)