enable_shared_from_this/not_shared.cc: Adjust, remove xfail.

2005-11-10  Paolo Carlini  <pcarlini@suse.de>

	* testsuite/tr1/2_general_utilities/memory/
	enable_shared_from_this/not_shared.cc: Adjust, remove xfail.
	* testsuite/tr1/2_general_utilities/memory/
	enable_shared_from_this/not_shared2.cc: Likewise.
	* testsuite/tr1/2_general_utilities/memory/
	enable_shared_from_this/not_shared3.cc: Likewise.

From-SVN: r106736

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0ca7b0cfa490ddaf3fd39a8e1718a5614d80d8fd..1e03518357ef62326fd5070185092d0a76a8f2fd 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-10  Paolo Carlini  <pcarlini@suse.de>
+
+       * testsuite/tr1/2_general_utilities/memory/
+       enable_shared_from_this/not_shared.cc: Adjust, remove xfail.
+       * testsuite/tr1/2_general_utilities/memory/
+       enable_shared_from_this/not_shared2.cc: Likewise.
+       * testsuite/tr1/2_general_utilities/memory/
+       enable_shared_from_this/not_shared3.cc: Likewise.
+
 2005-11-10  Paolo Carlini  <pcarlini@suse.de>
 
        * include/tr1/boost_shared_ptr.h (_Sp_counted_base::release,

diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/enable_shared_from_this/not_shared.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/enable_shared_from_this/not_shared.cc
index ca163435bddac6600c63093847f8db064edde8e7..c7a9dbf722c46582214c6afa2cd2aee468d9f172 100644 (file)
--- a/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/enable_shared_from_this/not_shared.cc
+++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/enable_shared_from_this/not_shared.cc
@@ -1,4 +1,3 @@
-// { dg-do run { xfail *-*-* } }
 // Copyright (C) 2005 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -34,18 +33,20 @@ test01()
   X x;
 
   try
-  {
-    std::tr1::shared_ptr<X> p = x.shared_from_this();
-  }
+    {
+      std::tr1::shared_ptr<X> p = x.shared_from_this();
+      VERIFY( false );
+    }
   catch (const std::tr1::bad_weak_ptr&)
-  {
-    // Expected.
-    __throw_exception_again;
-  }
+    {
+      // Expected.
+      VERIFY( true );
+    }
   catch (...)
-  {
-    // Failed.
-  }
+    {
+      // Failed.
+      VERIFY( false );
+    }
 
   return 0;
 }

diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/enable_shared_from_this/not_shared2.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/enable_shared_from_this/not_shared2.cc
index f4521099b63f9c4341add49da5282a307cb7c58d..9f5f88eea0af4a8cdc6e4b88ce6a383bf1c3433a 100644 (file)
--- a/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/enable_shared_from_this/not_shared2.cc
+++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/enable_shared_from_this/not_shared2.cc
@@ -1,4 +1,3 @@
-// { dg-do run { xfail *-*-* } }
 // Copyright (C) 2005 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -36,18 +35,20 @@ test01()
   X x(*p);  // copy of shared object should not be shared
 
   try
-  {
-    std::tr1::shared_ptr<X> p = x.shared_from_this();
-  }
+    {
+      std::tr1::shared_ptr<X> p = x.shared_from_this();
+      VERIFY( false );
+    }
   catch (const std::tr1::bad_weak_ptr&)
-  {
-    // Expected.
-    __throw_exception_again;
-  }
+    {
+      // Expected.
+      VERIFY( true );
+    }
   catch (...)
-  {
-    // Failed.
-  }
+    {
+      // Failed.
+      VERIFY( false );
+    }
 
   return 0;
 }

diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/enable_shared_from_this/not_shared3.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/enable_shared_from_this/not_shared3.cc
index 93881770bcff38bca93618b6515b226c5e25e742..14b203b9fd04f43c248f6247a8e179189123b69e 100644 (file)
--- a/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/enable_shared_from_this/not_shared3.cc
+++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/enable_shared_from_this/not_shared3.cc
@@ -1,4 +1,3 @@
-// { dg-do run { xfail *-*-* } }
 // Copyright (C) 2005 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -37,18 +36,20 @@ test01()
   x = *p;  // copy of shared object should not be shared
 
   try
-  {
-    std::tr1::shared_ptr<X> p = x.shared_from_this();
-  }
+    {
+      std::tr1::shared_ptr<X> p = x.shared_from_this();
+      VERIFY( false );
+    }
   catch (const std::tr1::bad_weak_ptr&)
-  {
-    // Expected.
-    __throw_exception_again;
-  }
+    {
+      // Expected.
+      VERIFY( true );
+    }
   catch (...)
-  {
-    // Failed.
-  }
+    {
+      // Failed.
+      VERIFY( false );
+    }
 
   return 0;
 }