This revision was automatically updated to reflect the committed changes.
Closed by commit rL286813: Protect nested-exceptions tests under no-exceptions
(authored by rogfer01).
Changed prior to commit:
https://reviews.llvm.org/D26458?vs=77363&id=77782#toc
Repository:
rL LLVM
https://reviews.llvm.org/D26458
Files:
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
Index: libcxx/trunk/test/std/language.support/support.exception/except.nested/assign.pass.cpp
===================================================================
--- libcxx/trunk/test/std/language.support/support.exception/except.nested/assign.pass.cpp
+++ libcxx/trunk/test/std/language.support/support.exception/except.nested/assign.pass.cpp
@@ -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 @@
e = e0;
assert(e.nested_ptr() == nullptr);
}
+#ifndef TEST_HAS_NO_EXCEPTIONS
{
try
{
@@ -57,4 +59,5 @@
}
}
}
+#endif
}
Index: 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_copy.pass.cpp
+++ libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_copy.pass.cpp
@@ -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 @@
std::nested_exception e = e0;
assert(e.nested_ptr() == nullptr);
}
+#ifndef TEST_HAS_NO_EXCEPTIONS
{
try
{
@@ -55,4 +57,5 @@
}
}
}
+#endif
}
Index: libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_default.pass.cpp
===================================================================
--- libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_default.pass.cpp
+++ libcxx/trunk/test/std/language.support/support.exception/except.nested/ctor_default.pass.cpp
@@ -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 @@
std::nested_exception e;
assert(e.nested_ptr() == nullptr);
}
+#ifndef TEST_HAS_NO_EXCEPTIONS
{
try
{
@@ -53,4 +55,5 @@
}
}
}
+#endif
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
