From 7a37d6eaff371edd55ca3f7d242565bbb14003ca Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 23 Dec 2011 17:31:00 +0000 Subject: [PATCH] weak_ptr_expired.cc: Modify to PASS instead of XFAIL. * testsuite/tr1/2_general_utilities/shared_ptr/cons/ weak_ptr_expired.cc: Modify to PASS instead of XFAIL. From-SVN: r182661 --- libstdc++-v3/ChangeLog | 5 +++++ .../shared_ptr/cons/weak_ptr_expired.cc | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6401cf94506..2d9e423557b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2011-12-23 Jonathan Wakely + + * testsuite/tr1/2_general_utilities/shared_ptr/cons/ + weak_ptr_expired.cc: Modify to PASS instead of XFAIL. + 2011-12-23 Kai Tietz * config/os/mingw32-w64/os_defines.h (__USE_MINGW_ANSI_STDIO): Define. diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/weak_ptr_expired.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/weak_ptr_expired.cc index 27fbc70dc03..3cf9ba16f7e 100644 --- a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/weak_ptr_expired.cc +++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/weak_ptr_expired.cc @@ -1,5 +1,5 @@ -// { dg-do run { xfail *-*-* } } -// Copyright (C) 2005, 2009 Free Software Foundation +// { dg-do run } +// Copyright (C) 2005, 2009, 2010, 2011 Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -29,7 +29,7 @@ struct A { }; int test01() { - bool test __attribute__((unused)) = true; + bool test = false; std::tr1::shared_ptr a1(new A); std::tr1::weak_ptr wa(a1); @@ -42,12 +42,9 @@ test01() catch (const std::tr1::bad_weak_ptr&) { // Expected. - __throw_exception_again; - } - catch (...) - { - // Failed. + test = true; } + VERIFY( test ); return 0; }