[libcxx-commits] [libcxx] dd0b7a5 - [libc++] Adjust D_LIBCPP_ENABLE_ASSERTIONS defines in exception_guard tests

Louis Dionne via libcxx-commits libcxx-commits at lists.llvm.org
Thu Apr 20 04:49:12 PDT 2023


Author: Louis Dionne
Date: 2023-04-20T07:48:59-04:00
New Revision: dd0b7a59eb48335a7d5bb953c9a2aa9380291171

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

LOG: [libc++] Adjust D_LIBCPP_ENABLE_ASSERTIONS defines in exception_guard tests

For the assert.FOO.pass.cpp test, we should be passing _LIBCPP_ENABLE_ASSERTIONS=1
for consistency, even though -D_LIBCPP_ENABLE_ASSERTIONS is equivalent.

For the other test, we shouldn't be forcing assertions to be enabled,
since we already have a CI job that enables assertions by default and
will do the right thing.

Differential Revision: https://reviews.llvm.org/D148736

Added: 
    

Modified: 
    libcxx/test/libcxx/utilities/assert.exception_guard.no_exceptions.pass.cpp
    libcxx/test/libcxx/utilities/exception_guard.no_exceptions.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libcxx/test/libcxx/utilities/assert.exception_guard.no_exceptions.pass.cpp b/libcxx/test/libcxx/utilities/assert.exception_guard.no_exceptions.pass.cpp
index c8dad0a544c04..7b3951dd70701 100644
--- a/libcxx/test/libcxx/utilities/assert.exception_guard.no_exceptions.pass.cpp
+++ b/libcxx/test/libcxx/utilities/assert.exception_guard.no_exceptions.pass.cpp
@@ -10,7 +10,7 @@
 
 // REQUIRES: has-unix-headers
 // XFAIL: availability-verbose_abort-missing
-// ADDITIONAL_COMPILE_FLAGS: -fno-exceptions -D_LIBCPP_ENABLE_ASSERTIONS
+// ADDITIONAL_COMPILE_FLAGS: -fno-exceptions -D_LIBCPP_ENABLE_ASSERTIONS=1
 
 // ADDITIONAL_COMPILE_FLAGS: -Wno-private-header
 

diff  --git a/libcxx/test/libcxx/utilities/exception_guard.no_exceptions.pass.cpp b/libcxx/test/libcxx/utilities/exception_guard.no_exceptions.pass.cpp
index d844f3c7f7ff4..7f2bcbca11ca0 100644
--- a/libcxx/test/libcxx/utilities/exception_guard.no_exceptions.pass.cpp
+++ b/libcxx/test/libcxx/utilities/exception_guard.no_exceptions.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++03
 
-// ADDITIONAL_COMPILE_FLAGS: -fno-exceptions -D_LIBCPP_ENABLE_ASSERTIONS
+// ADDITIONAL_COMPILE_FLAGS: -fno-exceptions
 
 #include <utility>
 


        


More information about the libcxx-commits mailing list