[libcxxabi] r292495 - Merging r292135:

[Hans Wennborg via cfe-commits]

Author: hans
Date: Thu Jan 19 10:52:39 2017
New Revision: 292495

URL: http://llvm.org/viewvc/llvm-project?rev=292495&view=rev
Log:
Merging r292135:
------------------------------------------------------------------------
r292135 | marshall | 2017-01-16 07:28:03 -0800 (Mon, 16 Jan 2017) | 1 line

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.
------------------------------------------------------------------------

Modified:
    libcxxabi/branches/release_40/   (props changed)
    libcxxabi/branches/release_40/test/libcxxabi/test/config.py
    libcxxabi/branches/release_40/test/unwind_02.pass.cpp
    libcxxabi/branches/release_40/test/unwind_03.pass.cpp
    libcxxabi/branches/release_40/test/unwind_04.pass.cpp
    libcxxabi/branches/release_40/test/unwind_05.pass.cpp

Propchange: libcxxabi/branches/release_40/
------------------------------------------------------------------------------
    svn:mergeinfo = /libcxxabi/trunk:292135

Modified: libcxxabi/branches/release_40/test/libcxxabi/test/config.py
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/branches/release_40/test/libcxxabi/test/config.py?rev=292495&r1=292494&r2=292495&view=diff
==============================================================================
--- libcxxabi/branches/release_40/test/libcxxabi/test/config.py (original)
+++ libcxxabi/branches/release_40/test/libcxxabi/test/config.py Thu Jan 19 10:52:39 2017
@@ -55,10 +55,6 @@ class Configuration(LibcxxConfiguration)
         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):

Modified: libcxxabi/branches/release_40/test/unwind_02.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/branches/release_40/test/unwind_02.pass.cpp?rev=292495&r1=292494&r2=292495&view=diff
==============================================================================
--- libcxxabi/branches/release_40/test/unwind_02.pass.cpp (original)
+++ libcxxabi/branches/release_40/test/unwind_02.pass.cpp Thu Jan 19 10:52:39 2017
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: libcxxabi-no-exceptions
+// REQUIRES-ANY: c++98, c++03, c++11, c++14
 
 #include <assert.h>
 

Modified: libcxxabi/branches/release_40/test/unwind_03.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/branches/release_40/test/unwind_03.pass.cpp?rev=292495&r1=292494&r2=292495&view=diff
==============================================================================
--- libcxxabi/branches/release_40/test/unwind_03.pass.cpp (original)
+++ libcxxabi/branches/release_40/test/unwind_03.pass.cpp Thu Jan 19 10:52:39 2017
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: libcxxabi-no-exceptions
+// REQUIRES-ANY: c++98, c++03, c++11, c++14
 
 #include <exception>
 #include <stdlib.h>

Modified: libcxxabi/branches/release_40/test/unwind_04.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/branches/release_40/test/unwind_04.pass.cpp?rev=292495&r1=292494&r2=292495&view=diff
==============================================================================
--- libcxxabi/branches/release_40/test/unwind_04.pass.cpp (original)
+++ libcxxabi/branches/release_40/test/unwind_04.pass.cpp Thu Jan 19 10:52:39 2017
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: libcxxabi-no-exceptions
+// REQUIRES-ANY: c++98, c++03, c++11, c++14
 
 #include <exception>
 #include <stdlib.h>

Modified: libcxxabi/branches/release_40/test/unwind_05.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/branches/release_40/test/unwind_05.pass.cpp?rev=292495&r1=292494&r2=292495&view=diff
==============================================================================
--- libcxxabi/branches/release_40/test/unwind_05.pass.cpp (original)
+++ libcxxabi/branches/release_40/test/unwind_05.pass.cpp Thu Jan 19 10:52:39 2017
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: libcxxabi-no-exceptions
+// REQUIRES-ANY: c++98, c++03, c++11, c++14
 
 #include <exception>
 #include <stdlib.h>