forked from OSchip/llvm-project
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 llvm-svn: 343545
This commit is contained in:
parent
8d7c421a70
commit
7fd4513920
|
@ -51,8 +51,6 @@ class LibcxxVectorDataFormatterTestCase(TestBase):
|
||||||
substrs=['1234'])
|
substrs=['1234'])
|
||||||
|
|
||||||
@add_test_categories(["libc++"])
|
@add_test_categories(["libc++"])
|
||||||
@skipIf(debug_info="gmodules",
|
|
||||||
bugnumber="https://bugs.llvm.org/show_bug.cgi?id=36048")
|
|
||||||
def test_with_run_command(self):
|
def test_with_run_command(self):
|
||||||
"""Test that that file and class static variables display correctly."""
|
"""Test that that file and class static variables display correctly."""
|
||||||
self.build()
|
self.build()
|
||||||
|
@ -180,8 +178,6 @@ class LibcxxVectorDataFormatterTestCase(TestBase):
|
||||||
substrs=['vector has 0 items'])
|
substrs=['vector has 0 items'])
|
||||||
|
|
||||||
@add_test_categories(["libc++"])
|
@add_test_categories(["libc++"])
|
||||||
@skipIf(debug_info="gmodules",
|
|
||||||
bugnumber="https://bugs.llvm.org/show_bug.cgi?id=36048")
|
|
||||||
def test_ref_and_ptr(self):
|
def test_ref_and_ptr(self):
|
||||||
"""Test that that file and class static variables display correctly."""
|
"""Test that that file and class static variables display correctly."""
|
||||||
self.build()
|
self.build()
|
||||||
|
|
|
@ -246,6 +246,10 @@ MANDATORY_MODULE_BUILD_CFLAGS := -fmodules -gmodules -fmodules-cache-path=$(CLAN
|
||||||
|
|
||||||
ifeq "$(MAKE_GMODULES)" "YES"
|
ifeq "$(MAKE_GMODULES)" "YES"
|
||||||
CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS)
|
CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS)
|
||||||
|
CXXFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS)
|
||||||
|
ifeq "$(OS)" "Darwin"
|
||||||
|
CXXFLAGS += -fcxx-modules
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CXXFLAGS += -std=c++11 $(CFLAGS) $(ARCH_CXXFLAGS)
|
CXXFLAGS += -std=c++11 $(CFLAGS) $(ARCH_CXXFLAGS)
|
||||||
|
|
Loading…
Reference in New Issue