summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/language.support/support.exception
diff options
context:
space:
mode:
authorRoger Ferrer Ibanez <roger.ferreribanez@arm.com>2016-11-14 11:00:28 +0000
committerRoger Ferrer Ibanez <roger.ferreribanez@arm.com>2016-11-14 11:00:28 +0000
commit059680f3f0c1b755b04425562efdf7284ff9ac70 (patch)
treec5e0e551f0b153dd8241fb90fd04e456b9c0447d /libcxx/test/std/language.support/support.exception
parent84c152a130ff95e52846dddd2cc6ad1c31648160 (diff)
downloadbcm5719-llvm-059680f3f0c1b755b04425562efdf7284ff9ac70.tar.gz
bcm5719-llvm-059680f3f0c1b755b04425562efdf7284ff9ac70.zip
Protect nested-exceptions tests under no-exceptions
Differential Revision: https://reviews.llvm.org/D26458 llvm-svn: 286813
Diffstat (limited to 'libcxx/test/std/language.support/support.exception')
-rw-r--r--libcxx/test/std/language.support/support.exception/except.nested/assign.pass.cpp5
-rw-r--r--libcxx/test/std/language.support/support.exception/except.nested/ctor_copy.pass.cpp5
-rw-r--r--libcxx/test/std/language.support/support.exception/except.nested/ctor_default.pass.cpp5
3 files changed, 12 insertions, 3 deletions
diff --git a/libcxx/test/std/language.support/support.exception/except.nested/assign.pass.cpp b/libcxx/test/std/language.support/support.exception/except.nested/assign.pass.cpp
index a5508d1436f..6338c8aaa26 100644
--- a/libcxx/test/std/language.support/support.exception/except.nested/assign.pass.cpp
+++ b/libcxx/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 @@ int main()
e = e0;
assert(e.nested_ptr() == nullptr);
}
+#ifndef TEST_HAS_NO_EXCEPTIONS
{
try
{
@@ -57,4 +59,5 @@ int main()
}
}
}
+#endif
}
diff --git a/libcxx/test/std/language.support/support.exception/except.nested/ctor_copy.pass.cpp b/libcxx/test/std/language.support/support.exception/except.nested/ctor_copy.pass.cpp
index f9f293300e6..4cbdbb2ec89 100644
--- a/libcxx/test/std/language.support/support.exception/except.nested/ctor_copy.pass.cpp
+++ b/libcxx/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 @@ 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
}
diff --git a/libcxx/test/std/language.support/support.exception/except.nested/ctor_default.pass.cpp b/libcxx/test/std/language.support/support.exception/except.nested/ctor_default.pass.cpp
index 67766aa2c46..18ca9968ff5 100644
--- a/libcxx/test/std/language.support/support.exception/except.nested/ctor_default.pass.cpp
+++ b/libcxx/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 @@ int main()
std::nested_exception e;
assert(e.nested_ptr() == nullptr);
}
+#ifndef TEST_HAS_NO_EXCEPTIONS
{
try
{
@@ -53,4 +55,5 @@ int main()
}
}
}
+#endif
}
OpenPOWER on IntegriCloud