aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2011-12-23 17:31:00 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2011-12-23 17:31:00 +0000
commit7a37d6eaff371edd55ca3f7d242565bbb14003ca (patch)
treed4638972ac804dabae29f25759c55df495e1a89a /libstdc++-v3
parent737be29e4c88eadb0c2bb6a147e6a1887f86150f (diff)
downloadgcc-7a37d6eaff371edd55ca3f7d242565bbb14003ca.zip
gcc-7a37d6eaff371edd55ca3f7d242565bbb14003ca.tar.gz
gcc-7a37d6eaff371edd55ca3f7d242565bbb14003ca.tar.bz2
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
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/weak_ptr_expired.cc13
2 files changed, 10 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6401cf9..2d9e423 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-23 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ * testsuite/tr1/2_general_utilities/shared_ptr/cons/
+ weak_ptr_expired.cc: Modify to PASS instead of XFAIL.
+
2011-12-23 Kai Tietz <ktietz@redhat.com>
* 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 27fbc70..3cf9ba1 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<A> a1(new A);
std::tr1::weak_ptr<A> 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;
}