2004-09-17 Paolo Carlini <pcarlini@suse.de>

	* testsuite/ext/mt_allocator/tune-1.cc: Use VERIFY, clean
	up a bit.
	* testsuite/ext/mt_allocator/tune-2.cc: Likewise.
	* testsuite/ext/mt_allocator/tune-3.cc: Likewise.
	* testsuite/ext/mt_allocator/tune-4.cc: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@87638 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 48 insertions, 54 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index acc46b7349b..6dfa61ead49 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,4 +1,12 @@
 2004-09-17  Paolo Carlini  <pcarlini@suse.de>
+
+	* testsuite/ext/mt_allocator/tune-1.cc: Use VERIFY, clean
+	up a bit.
+	* testsuite/ext/mt_allocator/tune-2.cc: Likewise.
+	* testsuite/ext/mt_allocator/tune-3.cc: Likewise.
+	* testsuite/ext/mt_allocator/tune-4.cc: Likewise.
+
+2004-09-17  Paolo Carlini  <pcarlini@suse.de>
 	    Andrea Arcangeli  <andrea@suse.de>
 
 	* config/io/basic_file_stdio.cc (__basic_file<>::close)): Don't
diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/tune-1.cc b/libstdc++-v3/testsuite/ext/mt_allocator/tune-1.cc
index d5769fce026..fa4dd45b41d 100644
--- a/libstdc++-v3/testsuite/ext/mt_allocator/tune-1.cc
+++ b/libstdc++-v3/testsuite/ext/mt_allocator/tune-1.cc
@@ -18,20 +18,17 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-#include <cassert>
+#include <testsuite_hooks.h>
 #include <memory>
 #include <ext/mt_allocator.h>
 
-struct pod
-{
-  int i;
-};
-
 // Tune characteristics. 
 // __common_pool_policy
 void test01()
 {
-  typedef pod value_type;
+  bool test __attribute__((unused)) = true;
+
+  typedef __gnu_test::pod_int value_type;
 #ifdef __GTHREADS
   typedef __gnu_cxx::__common_pool_policy<true> policy_type;
 #else
@@ -46,17 +43,17 @@ void test01()
 
   allocator_type a;
   tune_type t1 = a._M_get_options();  
-  assert(t1._M_align == t_default._M_align);
+  VERIFY( t1._M_align == t_default._M_align );
   a._M_set_options(t_opt);
-  tune_type t2 = a._M_get_options();  
-  assert(t1._M_align != t2._M_align);
+  tune_type t2 = a._M_get_options();
+  VERIFY( t1._M_align != t2._M_align );
 
   allocator_type::pointer p1 = a.allocate(128);
   allocator_type::pointer p2 = a.allocate(5128);
   a._M_set_options(t_single);
   t1 = a._M_get_options();  
-  assert(t1._M_max_threads != t_single._M_max_threads);
-  assert(t1._M_max_threads == t_opt._M_max_threads);
+  VERIFY( t1._M_max_threads != t_single._M_max_threads );
+  VERIFY( t1._M_max_threads == t_opt._M_max_threads );
 
   a.deallocate(p1, 128);
   a.deallocate(p2, 5128);
diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/tune-2.cc b/libstdc++-v3/testsuite/ext/mt_allocator/tune-2.cc
index 72860694205..60e9b38ebff 100644
--- a/libstdc++-v3/testsuite/ext/mt_allocator/tune-2.cc
+++ b/libstdc++-v3/testsuite/ext/mt_allocator/tune-2.cc
@@ -18,20 +18,17 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-#include <cassert>
+#include <testsuite_hooks.h>
 #include <memory>
 #include <ext/mt_allocator.h>
 
-struct pod
-{
-  int i;
-};
-
 // Tune characteristics. 
 // __per_type_pool_policy
 void test02()
 {
-  typedef pod value_type;
+  bool test __attribute__((unused)) = true;
+
+  typedef __gnu_test::pod_int value_type;
 #ifdef __GTHREADS
   typedef __gnu_cxx::__per_type_pool_policy<value_type, true> policy_type;
 #else
@@ -46,23 +43,22 @@ void test02()
 
   allocator_type a;
   tune_type t1 = a._M_get_options();  
-  assert(t1._M_align == t_default._M_align);
+  VERIFY( t1._M_align == t_default._M_align );
   a._M_set_options(t_opt);
-  tune_type t2 = a._M_get_options();  
-  assert(t1._M_align != t2._M_align);
+  tune_type t2 = a._M_get_options();
+  VERIFY( t1._M_align != t2._M_align );
 
   allocator_type::pointer p1 = a.allocate(128);
   allocator_type::pointer p2 = a.allocate(5128);
   a._M_set_options(t_single);
   t1 = a._M_get_options();  
-  assert(t1._M_max_threads != t_single._M_max_threads);
-  assert(t1._M_max_threads == t_opt._M_max_threads);
+  VERIFY( t1._M_max_threads != t_single._M_max_threads );
+  VERIFY( t1._M_max_threads == t_opt._M_max_threads );
 
   a.deallocate(p1, 128);
   a.deallocate(p2, 5128);
 }
 
-
 int main()
 {
   test02();
diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/tune-3.cc b/libstdc++-v3/testsuite/ext/mt_allocator/tune-3.cc
index aeb732f1156..e1d2105d3af 100644
--- a/libstdc++-v3/testsuite/ext/mt_allocator/tune-3.cc
+++ b/libstdc++-v3/testsuite/ext/mt_allocator/tune-3.cc
@@ -18,15 +18,10 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-#include <cassert>
+#include <testsuite_hooks.h>
 #include <memory>
 #include <ext/mt_allocator.h>
 
-struct pod
-{
-  int i;
-};
-
 // Tune characteristics, two of same type
 template<typename _Tp>
 struct test_policy
@@ -43,6 +38,8 @@ struct test_policy<__gnu_cxx::__common_pool_policy<_Thread> >
 template<typename _Tp, typename _Cp>
 void test03()
 {
+  bool test __attribute__((unused)) = true;
+
   typedef __gnu_cxx::__pool_base::_Tune tune_type;
   typedef _Tp value_type;
   typedef _Cp policy_type;
@@ -58,29 +55,28 @@ void test03()
   tune_type t2;
   if (test_policy<policy_type>::per_type())
     {
-      assert(t1._M_align == t_default._M_align);
+      VERIFY( t1._M_align == t_default._M_align );
       a._M_set_options(t_opt);
-      t2 = a._M_get_options();  
-      assert(t1._M_align != t2._M_align);
+      t2 = a._M_get_options();
+      VERIFY( t1._M_align != t2._M_align );
     }
   else
     t2 = t1;
 
-
   // Lock tune settings.
   typename allocator_type::pointer p1 = a.allocate(128);
 
   allocator_type a2;
   tune_type t3 = a2._M_get_options();  
   tune_type t4;
-  assert(t3._M_max_threads == t2._M_max_threads);
+  VERIFY( t3._M_max_threads == t2._M_max_threads );
 
   typename allocator_type::pointer p2 = a2.allocate(5128);
 
   a2._M_set_options(t_single);
-  t4 = a2._M_get_options();  
-  assert(t4._M_max_threads != t_single._M_max_threads);
-  assert(t4._M_max_threads == t3._M_max_threads);
+  t4 = a2._M_get_options();
+  VERIFY( t4._M_max_threads != t_single._M_max_threads );
+  VERIFY( t4._M_max_threads == t3._M_max_threads );
 
   a.deallocate(p1, 128);
   a2.deallocate(p2, 5128);
diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/tune-4.cc b/libstdc++-v3/testsuite/ext/mt_allocator/tune-4.cc
index b85de24e561..da85295a5de 100644
--- a/libstdc++-v3/testsuite/ext/mt_allocator/tune-4.cc
+++ b/libstdc++-v3/testsuite/ext/mt_allocator/tune-4.cc
@@ -18,15 +18,10 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-#include <cassert>
+#include <testsuite_hooks.h>
 #include <memory>
 #include <ext/mt_allocator.h>
 
-struct pod
-{
-  int i;
-};
-
 // Tune characteristics, two of same type
 template<typename _Tp>
 struct test_policy
@@ -49,6 +44,8 @@ struct pod2
 template<typename _Tp, typename _Cp>
 void test04()
 {
+  bool test __attribute__((unused)) = true;
+  
   typedef __gnu_cxx::__pool_base::_Tune tune_type;
   typedef _Tp value_type;
   typedef _Cp policy_type;
@@ -63,10 +60,10 @@ void test04()
   tune_type t2;
   if (test_policy<policy_type>::per_type())
     {
-      assert(t1._M_align == t_default._M_align);
+      VERIFY( t1._M_align == t_default._M_align );
       a._M_set_options(t_opt);
       t2 = a._M_get_options();  
-      assert(t1._M_align != t2._M_align);
+      VERIFY( t1._M_align != t2._M_align );
     }
   else
     t2 = t1;
@@ -85,21 +82,21 @@ void test04()
   // Both policy_type and rebind_type::policy_type have same characteristics.
   if (test_policy<policy_type>::per_type())
     {
-      assert(t3._M_align == t_default._M_align);
+      VERIFY( t3._M_align == t_default._M_align );
       a2._M_set_options(t_opt);
-      t4 = a2._M_get_options();  
-      assert(t3._M_align != t4._M_align);
+      t4 = a2._M_get_options();
+      VERIFY( t3._M_align != t4._M_align );
       t3 = t4;
     }
   else
-    assert(t3._M_max_threads == t2._M_max_threads);
+    VERIFY( t3._M_max_threads == t2._M_max_threads );
 
   typename rebind_type::pointer p2 = a2.allocate(5128);
 
   a2._M_set_options(t_single);
-  t4 = a2._M_get_options();  
-  assert(t4._M_max_threads != t_single._M_max_threads);
-  assert(t4._M_max_threads == t3._M_max_threads);
+  t4 = a2._M_get_options();
+  VERIFY( t4._M_max_threads != t_single._M_max_threads );
+  VERIFY( t4._M_max_threads == t3._M_max_threads );
 
   a.deallocate(p1, 128);
   a2.deallocate(p2, 5128);