58659.cc: Use VERIFY instead of aborting.

	* testsuite/20_util/shared_ptr/cons/58659.cc: Use VERIFY instead of
	aborting.

From-SVN: r203325

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 60978e8a17df7c59cfa01727a46ce6a95292d4ee..5f1fb321ae81af0afa0c8436613d4439b88d2d56 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-09  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+       * testsuite/20_util/shared_ptr/cons/58659.cc: Use VERIFY instead of
+       aborting.
+
 2013-10-09  Marcus Shawcroft  <marcus.shawcroft@arm.com>
 
        * testsuite/20_util/shared_ptr/cons/58659.cc: Use __builtin_abort().

diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc
index 1b823bc50e2a52f6383be25c9149e819f6289c41..9315796b24025e4915422b30b1dcf6ea5b804f2b 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc
@@ -47,8 +47,7 @@ namespace std
 
       void deallocate(value_type* p, size_t n)
       {
-        if (n != 1 || p != (void*)storage || !allocated)
-          __builtin_abort();
+        VERIFY(n == 1 && p == (void*)storage && allocated);
         allocated = false;
       }