diff options
author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-05 13:08:02 +0000 |
---|---|---|
committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-05 13:08:02 +0000 |
commit | de75e380b11aded1d9b59b405e2c82d9f0afca7f (patch) | |
tree | c79d3f1ec8263865dcf8de6dcf62f66b4e98ee78 /libstdc++-v3 | |
parent | 2efabe49937ae2492b0052009af5d07d44eee6a6 (diff) | |
download | gcc-de75e380b11aded1d9b59b405e2c82d9f0afca7f.tar.gz |
* testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc: Modify to
PASS instead of XFAIL.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@183906 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 96125f95dc3..bb3f2337a77 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2012-02-05 Jonathan Wakely <jwakely.gcc@gmail.com> + + * testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc: Modify to + PASS instead of XFAIL. + 2012-02-05 Jeffrey Yasskin <jyasskin@gcc.gnu.org> Paolo Carlini <paolo.carlini@oracle.com> diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc index cff9b3b99d2..d2bf508fd99 100644 --- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc @@ -1,7 +1,6 @@ // { dg-options "-std=gnu++0x" } -// { dg-do run { xfail *-*-* } } -// Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation +// Copyright (C) 2005, 2006, 2007, 2009, 2012 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 @@ -31,7 +30,7 @@ struct A { }; int test01() { - bool test __attribute__((unused)) = true; + bool test = false; std::shared_ptr<A> a1(new A); std::weak_ptr<A> wa(a1); @@ -44,12 +43,9 @@ test01() catch (const std::bad_weak_ptr&) { // Expected. - __throw_exception_again; - } - catch (...) - { - // Failed. + test = true; } + VERIFY( test ); return 0; } |