Mark the dynamic-exception tests as unsupported under C++17, since it has no dynamic-exception specs. Also, remove a FIXME workaround from the config that allowed these tests to work under C++17. This addresses PR#31621.
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@292135 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/libcxxabi/test/config.py b/test/libcxxabi/test/config.py
index ac37665..e219961 100644
--- a/test/libcxxabi/test/config.py
+++ b/test/libcxxabi/test/config.py
@@ -55,10 +55,6 @@
if not self.get_lit_bool('enable_threads', True):
self.cxx.compile_flags += ['-D_LIBCXXABI_HAS_NO_THREADS']
self.config.available_features.add('libcxxabi-no-threads')
- # FIXME: Fix the unwind_* tests that test dynamic exception
- # specifications so they work in C++17 (or always test in C++14).
- # Suppressing this warning is a temporary workaround.
- self.cxx.addWarningFlagIfSupported('-Wno-dynamic-exception-spec')
super(Configuration, self).configure_compile_flags()
def configure_compile_flags_header_includes(self):
diff --git a/test/unwind_02.pass.cpp b/test/unwind_02.pass.cpp
index fbcc232..8b10807 100644
--- a/test/unwind_02.pass.cpp
+++ b/test/unwind_02.pass.cpp
@@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
// UNSUPPORTED: libcxxabi-no-exceptions
+// REQUIRES-ANY: c++98, c++03, c++11, c++14
#include <assert.h>
diff --git a/test/unwind_03.pass.cpp b/test/unwind_03.pass.cpp
index abefe7b..3d0bdf6 100644
--- a/test/unwind_03.pass.cpp
+++ b/test/unwind_03.pass.cpp
@@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
// UNSUPPORTED: libcxxabi-no-exceptions
+// REQUIRES-ANY: c++98, c++03, c++11, c++14
#include <exception>
#include <stdlib.h>
diff --git a/test/unwind_04.pass.cpp b/test/unwind_04.pass.cpp
index 4a44341..3046267 100644
--- a/test/unwind_04.pass.cpp
+++ b/test/unwind_04.pass.cpp
@@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
// UNSUPPORTED: libcxxabi-no-exceptions
+// REQUIRES-ANY: c++98, c++03, c++11, c++14
#include <exception>
#include <stdlib.h>
diff --git a/test/unwind_05.pass.cpp b/test/unwind_05.pass.cpp
index df1e429..998291a 100644
--- a/test/unwind_05.pass.cpp
+++ b/test/unwind_05.pass.cpp
@@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
// UNSUPPORTED: libcxxabi-no-exceptions
+// REQUIRES-ANY: c++98, c++03, c++11, c++14
#include <exception>
#include <stdlib.h>
