Author: ericwf
Date: Tue Feb 7 15:20:31 2017
New Revision: 294353
URL: http://llvm.org/viewvc/llvm-project?rev=294353&view=rev
Log:
Fix test failures when using modules.
Modified:
libcxx/trunk/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp
libcxx/trunk/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp
libcxx/trunk/test/libcxx/debug/containers/db_string.pass.cpp
libcxx/trunk/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp
libcxx/trunk/test/libcxx/debug/debug_abort.pass.cpp
libcxx/trunk/test/libcxx/debug/debug_throw.pass.cpp
libcxx/trunk/test/libcxx/debug/debug_throw_register.pass.cpp
libcxx/trunk/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp
Modified:
libcxx/trunk/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp?rev=294353&r1=294352&r2=294353&view=diff
==============================================================================
---
libcxx/trunk/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp
(original)
+++
libcxx/trunk/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp
Tue Feb 7 15:20:31 2017
@@ -9,11 +9,14 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14
// UNSUPPORTED: libcpp-no-exceptions, libcpp-no-if-constexpr
+// MODULES_DEFINES: _LIBCPP_DEBUG=1
+// MODULES_DEFINES: _LIBCPP_DEBUG_USE_EXCEPTIONS
// test container debugging
#define _LIBCPP_DEBUG 1
#define _LIBCPP_DEBUG_USE_EXCEPTIONS
+
#include <map>
#include <set>
#include <utility>
Modified:
libcxx/trunk/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp?rev=294353&r1=294352&r2=294353&view=diff
==============================================================================
---
libcxx/trunk/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp
(original)
+++
libcxx/trunk/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp
Tue Feb 7 15:20:31 2017
@@ -9,6 +9,8 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14
// UNSUPPORTED: libcpp-no-exceptions, libcpp-no-if-constexpr
+// MODULES_DEFINES: _LIBCPP_DEBUG=1
+// MODULES_DEFINES: _LIBCPP_DEBUG_USE_EXCEPTIONS
// test container debugging
Modified: libcxx/trunk/test/libcxx/debug/containers/db_string.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/debug/containers/db_string.pass.cpp?rev=294353&r1=294352&r2=294353&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/debug/containers/db_string.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/debug/containers/db_string.pass.cpp Tue Feb 7
15:20:31 2017
@@ -9,6 +9,8 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14
// UNSUPPORTED: libcpp-no-exceptions, libcpp-no-if-constexpr
+// MODULES_DEFINES: _LIBCPP_DEBUG=1
+// MODULES_DEFINES: _LIBCPP_DEBUG_USE_EXCEPTIONS
// test container debugging
Modified:
libcxx/trunk/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp?rev=294353&r1=294352&r2=294353&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp
(original)
+++ libcxx/trunk/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp
Tue Feb 7 15:20:31 2017
@@ -9,6 +9,8 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14
// UNSUPPORTED: libcpp-no-exceptions, libcpp-no-if-constexpr
+// MODULES_DEFINES: _LIBCPP_DEBUG=1
+// MODULES_DEFINES: _LIBCPP_DEBUG_USE_EXCEPTIONS
// test container debugging
Modified: libcxx/trunk/test/libcxx/debug/debug_abort.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/debug/debug_abort.pass.cpp?rev=294353&r1=294352&r2=294353&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/debug/debug_abort.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/debug/debug_abort.pass.cpp Tue Feb 7 15:20:31 2017
@@ -7,6 +7,9 @@
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
+
+// MODULES_DEFINES: _LIBCPP_DEBUG=0
+
// Test that the default debug handler aborts the program.
#define _LIBCPP_DEBUG 0
Modified: libcxx/trunk/test/libcxx/debug/debug_throw.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/debug/debug_throw.pass.cpp?rev=294353&r1=294352&r2=294353&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/debug/debug_throw.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/debug/debug_throw.pass.cpp Tue Feb 7 15:20:31 2017
@@ -7,7 +7,9 @@
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
+
// UNSUPPORTED: libcpp-no-exceptions
+// MODULES_DEFINES: _LIBCPP_DEBUG=0
// Test that the default debug handler can be overridden and test the
// throwing debug handler.
Modified: libcxx/trunk/test/libcxx/debug/debug_throw_register.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/debug/debug_throw_register.pass.cpp?rev=294353&r1=294352&r2=294353&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/debug/debug_throw_register.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/debug/debug_throw_register.pass.cpp Tue Feb 7
15:20:31 2017
@@ -7,7 +7,10 @@
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
+
// UNSUPPORTED: libcpp-no-exceptions
+// MODULES_DEFINES: _LIBCPP_DEBUG=1
+// MODULES_DEFINES: _LIBCPP_DEBUG_USE_EXCEPTIONS
// Test that defining _LIBCPP_DEBUG_USE_EXCEPTIONS causes _LIBCPP_ASSERT
// to throw on failure.
Modified:
libcxx/trunk/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp?rev=294353&r1=294352&r2=294353&view=diff
==============================================================================
---
libcxx/trunk/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp
(original)
+++
libcxx/trunk/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp
Tue Feb 7 15:20:31 2017
@@ -16,6 +16,8 @@
// However, for backwards compatibility, if _LIBCPP_NO_REMOVE_AUTOPTR
// is defined before including <memory>, then auto_ptr will be restored.
+// MODULES_DEFINES: _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
+
#define _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
#include <memory>
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
