Author: rogfer01 Date: Mon Nov 14 05:00:28 2016 New Revision: 286813 URL: http://llvm.org/viewvc/llvm-project?rev=286813&view=rev Log: Protect nested-exceptions tests under no-exceptions
Differential Revision: https://reviews.llvm.org/D26458 Modified: libcxx/trunk/test/std/language.support/support.exception/except.nested/assign.pass.cpp libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_copy.pass.cpp libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_default.pass.cpp Modified: libcxx/trunk/test/std/language.support/support.exception/except.nested/assign.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.exception/except.nested/assign.pass.cpp?rev=286813&r1=286812&r2=286813&view=diff ============================================================================== --- libcxx/trunk/test/std/language.support/support.exception/except.nested/assign.pass.cpp (original) +++ libcxx/trunk/test/std/language.support/support.exception/except.nested/assign.pass.cpp Mon Nov 14 05:00:28 2016 @@ -7,7 +7,6 @@ // //===----------------------------------------------------------------------===// -// XFAIL: libcpp-no-exceptions // <exception> // class nested_exception; @@ -17,6 +16,8 @@ #include <exception> #include <cassert> +#include "test_macros.h" + class A { int data_; @@ -34,6 +35,7 @@ int main() e = e0; assert(e.nested_ptr() == nullptr); } +#ifndef TEST_HAS_NO_EXCEPTIONS { try { @@ -57,4 +59,5 @@ int main() } } } +#endif } Modified: libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_copy.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_copy.pass.cpp?rev=286813&r1=286812&r2=286813&view=diff ============================================================================== --- libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_copy.pass.cpp (original) +++ libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_copy.pass.cpp Mon Nov 14 05:00:28 2016 @@ -7,7 +7,6 @@ // //===----------------------------------------------------------------------===// -// XFAIL: libcpp-no-exceptions // <exception> // class nested_exception; @@ -17,6 +16,8 @@ #include <exception> #include <cassert> +#include "test_macros.h" + class A { int data_; @@ -33,6 +34,7 @@ int main() std::nested_exception e = e0; assert(e.nested_ptr() == nullptr); } +#ifndef TEST_HAS_NO_EXCEPTIONS { try { @@ -55,4 +57,5 @@ int main() } } } +#endif } Modified: libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_default.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_default.pass.cpp?rev=286813&r1=286812&r2=286813&view=diff ============================================================================== --- libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_default.pass.cpp (original) +++ libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_default.pass.cpp Mon Nov 14 05:00:28 2016 @@ -7,7 +7,6 @@ // //===----------------------------------------------------------------------===// -// XFAIL: libcpp-no-exceptions // <exception> // class nested_exception; @@ -17,6 +16,8 @@ #include <exception> #include <cassert> +#include "test_macros.h" + class A { int data_; @@ -32,6 +33,7 @@ int main() std::nested_exception e; assert(e.nested_ptr() == nullptr); } +#ifndef TEST_HAS_NO_EXCEPTIONS { try { @@ -53,4 +55,5 @@ int main() } } } +#endif } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
