[libcxx-commits] [libcxx] 7dd6a86 - [libc++] Do not set the `availability=XXX` feature when not testing against a system libc++

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-02-21T14:21:16-05:00
New Revision: 7dd6a862e5ece866c787d4509a5a5cad19531fbc

URL: https://github.com/llvm/llvm-project/commit/7dd6a862e5ece866c787d4509a5a5cad19531fbc
DIFF: https://github.com/llvm/llvm-project/commit/7dd6a862e5ece866c787d4509a5a5cad19531fbc.diff

LOG: [libc++] Do not set the `availability=XXX` feature when not testing against a system libc++

Otherwise, the `availability=XXX` lit feature is set even when we're
testing trunk and _LIBCPP_DISABLE_AVAILABILITY is defined, which causes
tests that check for availability markup to be enabled and unexpectedly
pass.

Added: 
    

Modified: 
    libcxx/utils/libcxx/test/config.py

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py
index 215faf2368c9..8d6b90128b6c 100644
--- a/libcxx/utils/libcxx/test/config.py
+++ b/libcxx/utils/libcxx/test/config.py
@@ -418,7 +418,7 @@ def configure_features(self):
         # 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++':
+        if self.use_deployment and self.cxx_stdlib_under_test == 'libc++' and self.use_system_cxx_lib:
             self.config.available_features.add('availability')
             self.add_deployment_feature('availability')