diff --git a/libcxx/docs/DesignDocs/AvailabilityMarkup.rst b/libcxx/docs/DesignDocs/AvailabilityMarkup.rst index f36e789437d1..586c793e9541 100644 --- a/libcxx/docs/DesignDocs/AvailabilityMarkup.rst +++ b/libcxx/docs/DesignDocs/AvailabilityMarkup.rst @@ -77,11 +77,7 @@ Tests can be marked as XFAIL based on multiple features made available by lit: * if `--param=platform=macosx10.12` is passed, the following features will be available: - - availability - - availability=x86_64 - availability=macosx - - availability=x86_64-macosx - - availability=x86_64-apple-macosx10.12 - availability=macosx10.12 This feature is used to XFAIL a test that *is* using a class or a method marked @@ -90,12 +86,9 @@ Tests can be marked as XFAIL based on multiple features made available by lit: * if `use_system_cxx_lib` and `--param=platform=macosx10.12` are passed to lit, the following features will also be available: - - with_system_cxx_lib - - with_system_cxx_lib=x86_64 - with_system_cxx_lib=macosx - - with_system_cxx_lib=x86_64-macosx - - with_system_cxx_lib=x86_64-apple-macosx10.12 - with_system_cxx_lib=macosx10.12 + - with_system_cxx_lib=x86_64-apple-macosx10.12 This feature is used to XFAIL a test that is *not* using a class or a method marked as unavailable *but* that is expected to fail if deployed on an older diff --git a/libcxx/test/libcxx/containers/sequences/array/array.zero/db_back.pass.cpp b/libcxx/test/libcxx/containers/sequences/array/array.zero/db_back.pass.cpp index 2ba397519241..f4071d74a5c8 100644 --- a/libcxx/test/libcxx/containers/sequences/array/array.zero/db_back.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/array/array.zero/db_back.pass.cpp @@ -11,7 +11,7 @@ // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // test array::front() raises a debug error. diff --git a/libcxx/test/libcxx/containers/sequences/array/array.zero/db_front.pass.cpp b/libcxx/test/libcxx/containers/sequences/array/array.zero/db_front.pass.cpp index 9eb98d59a9d6..8338462ab2b7 100644 --- a/libcxx/test/libcxx/containers/sequences/array/array.zero/db_front.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/array/array.zero/db_front.pass.cpp @@ -11,7 +11,7 @@ // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // test array::front() raises a debug error. diff --git a/libcxx/test/libcxx/containers/sequences/array/array.zero/db_indexing.pass.cpp b/libcxx/test/libcxx/containers/sequences/array/array.zero/db_indexing.pass.cpp index 95016231136a..aad22e688d3d 100644 --- a/libcxx/test/libcxx/containers/sequences/array/array.zero/db_indexing.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/array/array.zero/db_indexing.pass.cpp @@ -11,7 +11,7 @@ // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // test array::operator[] raises a debug error. diff --git a/libcxx/test/libcxx/containers/sequences/list/list.cons/db_copy.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.cons/db_copy.pass.cpp index 13555410a4a4..ae4964ff51aa 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.cons/db_copy.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.cons/db_copy.pass.cpp @@ -8,7 +8,7 @@ // // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // list(list&& c); diff --git a/libcxx/test/libcxx/containers/sequences/list/list.cons/db_move.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.cons/db_move.pass.cpp index 5e7f3c419875..f477c0d25127 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.cons/db_move.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.cons/db_move.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03 // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/emplace_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/emplace_db1.pass.cpp index 41a7795fcf44..957b46005d7d 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/emplace_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/emplace_db1.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03 // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp index fe4452713c40..63a6a4421507 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp index c592b262a9a5..8a785e20b618 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp index 37bba2a2c1d3..3c0188f8eb90 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp index 2384d109a19a..24026d57d3d9 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp index 086b4282763a..fc7088f5888a 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp index e579600a2847..feca2d06ffda 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp index 27ccaface876..aa63556f1e0b 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_rvalue_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_rvalue_db1.pass.cpp index a9b63ba3b445..71e43cdeff2e 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_rvalue_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_rvalue_db1.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_size_value_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_size_value_db1.pass.cpp index 67bdfd24ea00..10e9cebad928 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_size_value_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_size_value_db1.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_value_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_value_db1.pass.cpp index 9f1153a0495b..9a2c989e1e4b 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_value_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_value_db1.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/pop_back_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/pop_back_db1.pass.cpp index fe607f03419b..4b7e1778eb83 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/pop_back_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/pop_back_db1.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list.pass.cpp index 9a65d02b2022..a32364ff2d2f 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter.pass.cpp index 71aad132829c..de0c6ce9444e 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter_iter.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter_iter.pass.cpp index af85e92fe99f..d4da6d55136d 100644 --- a/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter_iter.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter_iter.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // diff --git a/libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp b/libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp index 9386be0bb350..1be230bda8de 100644 --- a/libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp @@ -12,7 +12,7 @@ // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // test container debugging diff --git a/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp b/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp index 831f3e431620..802e9cb45bd9 100644 --- a/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp @@ -12,7 +12,7 @@ // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // test multihtreaded container debugging diff --git a/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp b/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp index efd5f293f8f4..d4ff4d7e09ed 100644 --- a/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp @@ -12,7 +12,7 @@ // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // test container debugging diff --git a/libcxx/test/libcxx/debug/containers/db_string.pass.cpp b/libcxx/test/libcxx/debug/containers/db_string.pass.cpp index ff0c77718473..21de5b484d69 100644 --- a/libcxx/test/libcxx/debug/containers/db_string.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_string.pass.cpp @@ -12,7 +12,7 @@ // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // test container debugging diff --git a/libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp b/libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp index b4cb874c8a33..72b447f8720d 100644 --- a/libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp @@ -12,7 +12,7 @@ // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // test container debugging diff --git a/libcxx/test/libcxx/debug/db_string_view.pass.cpp b/libcxx/test/libcxx/debug/db_string_view.pass.cpp index 6de2cf7021be..2c8fc38f1f91 100644 --- a/libcxx/test/libcxx/debug/db_string_view.pass.cpp +++ b/libcxx/test/libcxx/debug/db_string_view.pass.cpp @@ -12,7 +12,7 @@ // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // test container debugging diff --git a/libcxx/test/libcxx/debug/debug_abort.pass.cpp b/libcxx/test/libcxx/debug/debug_abort.pass.cpp index 89dbdc7688fd..5d3c61223e2b 100644 --- a/libcxx/test/libcxx/debug/debug_abort.pass.cpp +++ b/libcxx/test/libcxx/debug/debug_abort.pass.cpp @@ -10,7 +10,7 @@ // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=0 // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // Test that the default debug handler aborts the program. diff --git a/libcxx/test/libcxx/debug/debug_helper_test.pass.cpp b/libcxx/test/libcxx/debug/debug_helper_test.pass.cpp index be41d12d795d..1a8ae2a7deed 100644 --- a/libcxx/test/libcxx/debug/debug_helper_test.pass.cpp +++ b/libcxx/test/libcxx/debug/debug_helper_test.pass.cpp @@ -11,7 +11,7 @@ // UNSUPPORTED: windows // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 diff --git a/libcxx/test/libcxx/debug/debug_register.pass.cpp b/libcxx/test/libcxx/debug/debug_register.pass.cpp index ac298c03fc9a..d8d8021040ed 100644 --- a/libcxx/test/libcxx/debug/debug_register.pass.cpp +++ b/libcxx/test/libcxx/debug/debug_register.pass.cpp @@ -10,7 +10,7 @@ // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx #include #include diff --git a/libcxx/test/libcxx/iterators/advance.debug1.pass.cpp b/libcxx/test/libcxx/iterators/advance.debug1.pass.cpp index f9b9596655bd..6fdd3e8cddfc 100644 --- a/libcxx/test/libcxx/iterators/advance.debug1.pass.cpp +++ b/libcxx/test/libcxx/iterators/advance.debug1.pass.cpp @@ -9,7 +9,7 @@ // Can't test the system lib because this test enables debug mode // UNSUPPORTED: c++98, c++03 // UNSUPPORTED: windows -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=0 // diff --git a/libcxx/test/libcxx/iterators/next.debug1.pass.cpp b/libcxx/test/libcxx/iterators/next.debug1.pass.cpp index f7190645822f..6ae9de611802 100644 --- a/libcxx/test/libcxx/iterators/next.debug1.pass.cpp +++ b/libcxx/test/libcxx/iterators/next.debug1.pass.cpp @@ -9,7 +9,7 @@ // Can't test the system lib because this test enables debug mode // UNSUPPORTED: c++98, c++03 // UNSUPPORTED: windows -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=0 // diff --git a/libcxx/test/libcxx/iterators/prev.debug1.pass.cpp b/libcxx/test/libcxx/iterators/prev.debug1.pass.cpp index b58debcdf794..9265759a0be0 100644 --- a/libcxx/test/libcxx/iterators/prev.debug1.pass.cpp +++ b/libcxx/test/libcxx/iterators/prev.debug1.pass.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// // Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib +// UNSUPPORTED: with_system_cxx_lib=macosx + // UNSUPPORTED: c++98, c++03 // UNSUPPORTED: windows -// UNSUPPORTED: with_system_cxx_lib // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=0 // diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py index a328a6aeaeee..30aaf1b30095 100644 --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -368,12 +368,6 @@ class Configuration(object): self.cxx.use_ccache = True self.lit_config.note('enabling ccache') - def add_deployment_feature(self, feature): - (arch, name, version) = self.config.deployment - self.config.available_features.add('%s=%s-%s' % (feature, arch, name)) - self.config.available_features.add('%s=%s' % (feature, name)) - self.config.available_features.add('%s=%s%s' % (feature, name, version)) - def configure_features(self): additional_features = self.get_lit_conf('additional_features') if additional_features: @@ -388,27 +382,22 @@ class Configuration(object): # XFAIL markers for tests that are known to fail with versions of # libc++ as were shipped with a particular triple. if self.use_system_cxx_lib: - self.config.available_features.add('with_system_cxx_lib') - self.config.available_features.add( - 'with_system_cxx_lib=%s' % self.config.target_triple) - - # Add subcomponents individually. - target_components = self.config.target_triple.split('-') - for component in target_components: - self.config.available_features.add( - 'with_system_cxx_lib=%s' % component) + self.config.available_features.add('with_system_cxx_lib=%s' % self.config.target_triple) # Add available features for more generic versions of the target # triple attached to with_system_cxx_lib. if self.use_deployment: - self.add_deployment_feature('with_system_cxx_lib') + (_, name, version) = self.config.deployment + self.config.available_features.add('with_system_cxx_lib=%s' % name) + self.config.available_features.add('with_system_cxx_lib=%s%s' % (name, version)) # Configure the availability feature. Availability is only enabled # with libc++, because other standard libraries do not provide # availability markup. if self.use_deployment and self.cxx_stdlib_under_test == 'libc++': - self.config.available_features.add('availability') - self.add_deployment_feature('availability') + (_, name, version) = self.config.deployment + self.config.available_features.add('availability=%s' % name) + self.config.available_features.add('availability=%s%s' % (name, version)) # Insert the platform name into the available features as a lower case. self.config.available_features.add(target_platform)