This is an archive of the discontinued LLVM Phabricator instance.

Fix test failure for missing _LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS
ClosedPublic

Authored by tzik on May 3 2018, 5:03 AM.

Download Raw Diff

Details

Reviewers

Summary

This is a follow-up change to r331150. The CL moved the macro from individual
file to build file, but the macro is missed in a test config file.

Diff Detail

Repository: rCXXA libc++abi

Event Timeline

tzik created this revision.May 3 2018, 5:03 AM

Herald added subscribers: cfe-commits, christof. · View Herald TranscriptMay 3 2018, 5:03 AM

thakis accepted this revision.May 3 2018, 5:48 AM

This revision is now accepted and ready to land.May 3 2018, 5:48 AM

r331450, thanks!

Revision Contents

Path

Size

test/

libcxxabi/

test/

config.py

5 lines

Diff 145004

test/libcxxabi/test/config.py

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Lines	def configure_features(self):
self.config.available_features.add('libcxxabi-no-noexcept-function-type')		self.config.available_features.add('libcxxabi-no-noexcept-function-type')
# test_exception_storage_nodynmem.pass.cpp fails under this specific configuration		# test_exception_storage_nodynmem.pass.cpp fails under this specific configuration
if self.get_lit_bool('cxx_ext_threads', False) and self.get_lit_bool('libcxxabi_shared', False):		if self.get_lit_bool('cxx_ext_threads', False) and self.get_lit_bool('libcxxabi_shared', False):
self.config.available_features.add('libcxxabi-shared-externally-threaded')		self.config.available_features.add('libcxxabi-shared-externally-threaded')
if not self.get_lit_bool('llvm_unwinder', False):		if not self.get_lit_bool('llvm_unwinder', False):
self.config.available_features.add('libcxxabi-has-system-unwinder')		self.config.available_features.add('libcxxabi-has-system-unwinder')

def configure_compile_flags(self):		def configure_compile_flags(self):
self.cxx.compile_flags += ['-DLIBCXXABI_NO_TIMER']		self.cxx.compile_flags += [
		'-DLIBCXXABI_NO_TIMER',
		'-D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS',
		]
if self.get_lit_bool('enable_exceptions', True):		if self.get_lit_bool('enable_exceptions', True):
self.cxx.compile_flags += ['-funwind-tables']		self.cxx.compile_flags += ['-funwind-tables']
else:		else:
self.cxx.compile_flags += ['-fno-exceptions', '-DLIBCXXABI_HAS_NO_EXCEPTIONS']		self.cxx.compile_flags += ['-fno-exceptions', '-DLIBCXXABI_HAS_NO_EXCEPTIONS']
if not self.get_lit_bool('enable_threads', True):		if not self.get_lit_bool('enable_threads', True):
self.cxx.compile_flags += ['-D_LIBCXXABI_HAS_NO_THREADS']		self.cxx.compile_flags += ['-D_LIBCXXABI_HAS_NO_THREADS']
self.config.available_features.add('libcxxabi-no-threads')		self.config.available_features.add('libcxxabi-no-threads')
super(Configuration, self).configure_compile_flags()		super(Configuration, self).configure_compile_flags()
Show All 35 Lines