[libcxx] Remove the availability_markup LIT feature

It is now equivalent to the 'availability' LIT feature, so there's no reason to keep both. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@348653 91177308-0d34-0410-b5e6-96231b3b80d8
2024-11-23 11:59:52 +00:00 · 2018-12-07 21:48:39 +00:00 · 2018-12-07 21:48:39 +00:00 · f01e82fd42
commit f01e82fd42
parent a796feb20d
12 changed files with 60 additions and 76 deletions
--- a/docs/DesignDocs/AvailabilityMarkup.rst
+++ b/docs/DesignDocs/AvailabilityMarkup.rst
@ -55,7 +55,7 @@ or on a particular symbol:
 Testing
 =======

-Some parameters can be passed to lit to run the test-suite and exercising the
+Some parameters can be passed to lit to run the test-suite and exercise the
 availability.

 * The `platform` parameter controls the deployment target. For example lit can
@ -69,8 +69,7 @@ availability.
 Tests can be marked as XFAIL based on multiple features made available by lit:


-* if `use_system_cxx_lib` is passed to lit, assuming `--param=platform=macosx10.8`
-  is passed as well the following features will be available:
+* if `--param=platform=macosx10.8` is passed, the following features will be available:

  - availability
  - availability=x86_64
@ -82,8 +81,8 @@ Tests can be marked as XFAIL based on multiple features made available by lit:
  This feature is used to XFAIL a test that *is* using a class or a method marked
  as unavailable *and* that is expected to *fail* if deployed on an older system.

-* if `use_system_cxx_lib` is passed to lit, the following features will also
-  be available:
+* if `use_system_cxx_lib` and `--param=platform=macosx10.8` are passed to lit,
+  the following features will also be available:

  - with_system_cxx_lib
  - with_system_cxx_lib=x86_64
@ -94,19 +93,7 @@ Tests can be marked as XFAIL based on multiple features made available by lit:

  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
-  system. For example if we know that it exhibits a bug in the libc on a
-  particular system version.
-
-* if `with_availability` is passed to lit, the following features will also
-  be available:
-
-  - availability_markup
-  - availability_markup=x86_64
-  - availability_markup=macosx
-  - availability_markup=x86_64-macosx
-  - availability_markup=x86_64-apple-macosx10.8
-  - availability_markup=macosx10.8
-
-  This feature is used to XFAIL a test that *is* using a class or a method
-  marked as unavailable *but* that is expected to *pass* if deployed on an older
-  system. For example if it is using a symbol in a statically evaluated context.
+  system. For example, if the test exhibits a bug in the libc on a particular
+  system version, or if the test uses a symbol that is not available on an
+  older version of the dylib (but for which there is no availability markup,
+  otherwise the XFAIL should use `availability` above).
--- a/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_fsizeddeallocation.sh.cpp
+++ b/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_fsizeddeallocation.sh.cpp
@ -13,11 +13,11 @@
 // when sized deallocation is not supported, e.g., prior to C++14.

 // UNSUPPORTED: sanitizer-new-delete
-// XFAIL: availability_markup=macosx10.11
-// XFAIL: availability_markup=macosx10.10
-// XFAIL: availability_markup=macosx10.9
-// XFAIL: availability_markup=macosx10.8
-// XFAIL: availability_markup=macosx10.7
+// XFAIL: availability=macosx10.11
+// XFAIL: availability=macosx10.10
+// XFAIL: availability=macosx10.9
+// XFAIL: availability=macosx10.8
+// XFAIL: availability=macosx10.7


 // NOTE: Only clang-3.7 and GCC 5.1 and greater support -fsized-deallocation.
--- a/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_fsizeddeallocation.sh.cpp
+++ b/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_fsizeddeallocation.sh.cpp
@ -13,11 +13,11 @@
 // when sized deallocation is not supported, e.g., prior to C++14.

 // UNSUPPORTED: sanitizer-new-delete
-// XFAIL: availability_markup=macosx10.11
-// XFAIL: availability_markup=macosx10.10
-// XFAIL: availability_markup=macosx10.9
-// XFAIL: availability_markup=macosx10.8
-// XFAIL: availability_markup=macosx10.7
+// XFAIL: availability=macosx10.11
+// XFAIL: availability=macosx10.10
+// XFAIL: availability=macosx10.9
+// XFAIL: availability=macosx10.8
+// XFAIL: availability=macosx10.7

 // NOTE: Only clang-3.7 and GCC 5.1 and greater support -fsized-deallocation.
 // REQUIRES: -fsized-deallocation
--- a/test/std/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp
+++ b/test/std/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp
@ -11,8 +11,8 @@
 // REQUIRES: locale.ru_RU.UTF-8
 // UNSUPPORTED: sanitizer-new-delete

-// XFAIL: availability_markup=macosx10.8
-// XFAIL: availability_markup=macosx10.7
+// XFAIL: availability=macosx10.8
+// XFAIL: availability=macosx10.7

 // <locale>

--- a/test/std/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp
+++ b/test/std/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp
@ -11,8 +11,8 @@
 // REQUIRES: locale.ru_RU.UTF-8
 // UNSUPPORTED: sanitizer-new-delete

-// XFAIL: availability_markup=macosx10.8
-// XFAIL: availability_markup=macosx10.7
+// XFAIL: availability=macosx10.8
+// XFAIL: availability=macosx10.7

 // <locale>

--- a/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp
+++ b/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp
@ -11,8 +11,8 @@
 // REQUIRES: locale.ru_RU.UTF-8
 // UNSUPPORTED: sanitizer-new-delete

-// XFAIL: availability_markup=macosx10.8
-// XFAIL: availability_markup=macosx10.7
+// XFAIL: availability=macosx10.8
+// XFAIL: availability=macosx10.7

 // <locale>

--- a/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp
+++ b/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp
@ -9,13 +9,13 @@

 // UNSUPPORTED: c++98, c++03, c++11, c++14

-// XFAIL: availability_markup=macosx10.13
-// XFAIL: availability_markup=macosx10.12
-// XFAIL: availability_markup=macosx10.11
-// XFAIL: availability_markup=macosx10.10
-// XFAIL: availability_markup=macosx10.9
-// XFAIL: availability_markup=macosx10.8
-// XFAIL: availability_markup=macosx10.7
+// XFAIL: availability=macosx10.13
+// XFAIL: availability=macosx10.12
+// XFAIL: availability=macosx10.11
+// XFAIL: availability=macosx10.10
+// XFAIL: availability=macosx10.9
+// XFAIL: availability=macosx10.8
+// XFAIL: availability=macosx10.7

 // <optional>

--- a/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp
+++ b/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp
@ -10,13 +10,13 @@
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 // <optional>

-// XFAIL: availability_markup=macosx10.13
-// XFAIL: availability_markup=macosx10.12
-// XFAIL: availability_markup=macosx10.11
-// XFAIL: availability_markup=macosx10.10
-// XFAIL: availability_markup=macosx10.9
-// XFAIL: availability_markup=macosx10.8
-// XFAIL: availability_markup=macosx10.7
+// XFAIL: availability=macosx10.13
+// XFAIL: availability=macosx10.12
+// XFAIL: availability=macosx10.11
+// XFAIL: availability=macosx10.10
+// XFAIL: availability=macosx10.9
+// XFAIL: availability=macosx10.8
+// XFAIL: availability=macosx10.7

 // template <class T>
 //   constexpr optional<decay_t<T>> make_optional(T&& v);
--- a/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp
+++ b/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp
@ -12,13 +12,13 @@

 // <variant>

-// XFAIL: availability_markup=macosx10.13
-// XFAIL: availability_markup=macosx10.12
-// XFAIL: availability_markup=macosx10.11
-// XFAIL: availability_markup=macosx10.10
-// XFAIL: availability_markup=macosx10.9
-// XFAIL: availability_markup=macosx10.8
-// XFAIL: availability_markup=macosx10.7
+// XFAIL: availability=macosx10.13
+// XFAIL: availability=macosx10.12
+// XFAIL: availability=macosx10.11
+// XFAIL: availability=macosx10.10
+// XFAIL: availability=macosx10.9
+// XFAIL: availability=macosx10.8
+// XFAIL: availability=macosx10.7

 // template <class ...Types> class variant;

--- a/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp
+++ b/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp
@ -12,13 +12,13 @@

 // <variant>

-// XFAIL: availability_markup=macosx10.13
-// XFAIL: availability_markup=macosx10.12
-// XFAIL: availability_markup=macosx10.11
-// XFAIL: availability_markup=macosx10.10
-// XFAIL: availability_markup=macosx10.9
-// XFAIL: availability_markup=macosx10.8
-// XFAIL: availability_markup=macosx10.7
+// XFAIL: availability=macosx10.13
+// XFAIL: availability=macosx10.12
+// XFAIL: availability=macosx10.11
+// XFAIL: availability=macosx10.10
+// XFAIL: availability=macosx10.9
+// XFAIL: availability=macosx10.8
+// XFAIL: availability=macosx10.7

 // template <class ...Types> class variant;

--- a/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp
+++ b/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp
@ -12,13 +12,13 @@

 // <variant>

-// XFAIL: availability_markup=macosx10.13
-// XFAIL: availability_markup=macosx10.12
-// XFAIL: availability_markup=macosx10.11
-// XFAIL: availability_markup=macosx10.10
-// XFAIL: availability_markup=macosx10.9
-// XFAIL: availability_markup=macosx10.8
-// XFAIL: availability_markup=macosx10.7
+// XFAIL: availability=macosx10.13
+// XFAIL: availability=macosx10.12
+// XFAIL: availability=macosx10.11
+// XFAIL: availability=macosx10.10
+// XFAIL: availability=macosx10.9
+// XFAIL: availability=macosx10.8
+// XFAIL: availability=macosx10.7

 // template <class ...Types> class variant;

--- a/utils/libcxx/test/config.py
+++ b/utils/libcxx/test/config.py
@ -407,11 +407,8 @@ class Configuration(object):
            if self.use_deployment:
                self.add_deployment_feature('with_system_cxx_lib')

-        # Configure the availability markup checks features.
+        # Configure the availability feature.
        if self.use_deployment:
-            self.config.available_features.add('availability_markup')
-            self.add_deployment_feature('availability_markup')
-
            self.config.available_features.add('availability')
            self.add_deployment_feature('availability')