This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Consistently use VERIFY in the testsuite
- From: Paolo Carlini <pcarlini at suse dot de>
- To: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Thu, 18 Nov 2004 20:14:43 +0100
- Subject: [v3] Consistently use VERIFY in the testsuite
Hi,
spotted a few asserts around. Tested x86-linux, committed.
Paolo.
//////////////
2004-11-18 Paolo Carlini <pcarlini@suse.de>
* testsuite/26_numerics/numeric/sum_diff.cc: Use VERIFY.
* testsuite/ext/array_allocator/1.cc: Likewise.
* testsuite/ext/array_allocator/2.cc: Likewise.
* testsuite/ext/array_allocator/3.cc: Likewise.
* testsuite/ext/enc_filebuf/char/13598.cc: Likewise.
diff -urN libstdc++-v3-orig/testsuite/26_numerics/numeric/sum_diff.cc libstdc++-v3/testsuite/26_numerics/numeric/sum_diff.cc
--- libstdc++-v3-orig/testsuite/26_numerics/numeric/sum_diff.cc 2004-06-22 12:50:46.000000000 +0200
+++ libstdc++-v3/testsuite/26_numerics/numeric/sum_diff.cc 2004-11-18 19:43:11.000000000 +0100
@@ -1,4 +1,4 @@
-// Copyright (C) 2001 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
//
// 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
@@ -21,7 +21,7 @@
#include <algorithm>
#include <numeric>
-#include <cassert>
+#include <testsuite_hooks.h>
int A[] = {1, 4, 9, 16, 25, 36, 49, 64, 81, 100};
int B[] = {1, 3, 5, 7, 9, 11, 13, 15, 17, 19};
@@ -30,13 +30,15 @@
void
test01()
{
- int D[N];
+ bool test __attribute__((unused)) = true;
- std::adjacent_difference(A, A + N, D);
- assert(std::equal(D, D + N, B));
+ int D[N];
- std::partial_sum(D, D + N, D);
- assert(std::equal(D, D + N, A));
+ std::adjacent_difference(A, A + N, D);
+ VERIFY( std::equal(D, D + N, B) );
+
+ std::partial_sum(D, D + N, D);
+ VERIFY( std::equal(D, D + N, A) );
}
int
diff -urN libstdc++-v3-orig/testsuite/ext/array_allocator/1.cc libstdc++-v3/testsuite/ext/array_allocator/1.cc
--- libstdc++-v3-orig/testsuite/ext/array_allocator/1.cc 2004-10-08 00:06:23.000000000 +0200
+++ libstdc++-v3/testsuite/ext/array_allocator/1.cc 2004-11-18 19:45:38.000000000 +0100
@@ -25,9 +25,9 @@
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
-#include <cassert>
#include <string>
#include <ext/array_allocator.h>
+#include <testsuite_hooks.h>
typedef char char_type;
typedef std::char_traits<char_type> traits_type;
@@ -37,6 +37,8 @@
void test01()
{
+ bool test __attribute__((unused)) = true;
+
using std::basic_string;
typedef __gnu_cxx::array_allocator<char_type, array_type> allocator_type;
typedef basic_string<char_type, traits_type, allocator_type> string_type;
@@ -50,11 +52,11 @@
}
catch(std::bad_alloc& obj)
{
- assert(true);
+ VERIFY( true );
}
catch(...)
{
- assert(false);
+ VERIFY( false );
}
}
diff -urN libstdc++-v3-orig/testsuite/ext/array_allocator/2.cc libstdc++-v3/testsuite/ext/array_allocator/2.cc
--- libstdc++-v3-orig/testsuite/ext/array_allocator/2.cc 2004-10-13 10:58:41.000000000 +0200
+++ libstdc++-v3/testsuite/ext/array_allocator/2.cc 2004-11-18 19:46:32.000000000 +0100
@@ -25,10 +25,10 @@
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
-#include <cassert>
#include <string>
#include <iostream>
#include <ext/array_allocator.h>
+#include <testsuite_hooks.h>
typedef char char_type;
typedef std::char_traits<char_type> traits_type;
@@ -38,6 +38,8 @@
void test01()
{
+ bool test __attribute__((unused)) = true;
+
using std::basic_string;
typedef __gnu_cxx::array_allocator<char_type, array_type> allocator_type;
typedef basic_string<char_type, traits_type, allocator_type> string_type;
@@ -52,11 +54,11 @@
}
catch(std::bad_alloc& obj)
{
- assert(false);
+ VERIFY( false );
}
catch(...)
{
- assert(false);
+ VERIFY( false );
}
s.append(1, 'c');
diff -urN libstdc++-v3-orig/testsuite/ext/array_allocator/3.cc libstdc++-v3/testsuite/ext/array_allocator/3.cc
--- libstdc++-v3-orig/testsuite/ext/array_allocator/3.cc 2004-10-26 08:37:10.000000000 +0200
+++ libstdc++-v3/testsuite/ext/array_allocator/3.cc 2004-11-18 19:47:15.000000000 +0100
@@ -25,9 +25,9 @@
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
-#include <cassert>
#include <string>
#include <ext/array_allocator.h>
+#include <testsuite_hooks.h>
typedef char char_type;
typedef std::char_traits<char_type> traits_type;
@@ -37,6 +37,8 @@
void test01()
{
+ bool test __attribute__((unused)) = true;
+
using std::basic_string;
typedef __gnu_cxx::array_allocator<char_type, array_type> allocator_type;
typedef basic_string<char_type, traits_type, allocator_type> string_type;
@@ -51,11 +53,11 @@
}
catch(std::bad_alloc& obj)
{
- assert(true);
+ VERIFY( true );
}
catch(...)
{
- assert(false);
+ VERIFY( false );
}
}
diff -urN libstdc++-v3-orig/testsuite/ext/enc_filebuf/char/13598.cc libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc
--- libstdc++-v3-orig/testsuite/ext/enc_filebuf/char/13598.cc 2004-03-27 17:21:21.000000000 +0100
+++ libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc 2004-11-18 19:49:04.000000000 +0100
@@ -18,7 +18,7 @@
#include <locale>
#include <cstring>
-#include <cassert>
+#include <testsuite_hooks.h>
#ifdef _GLIBCXX_USE___ENC_TRAITS
#include <ext/enc_filebuf.h>
#endif
@@ -26,8 +26,9 @@
int main()
{
#ifdef _GLIBCXX_USE___ENC_TRAITS
- const char* str = "Hello, world!\n";
+ bool test __attribute__((unused)) = true;
+ const char* str = "Hello, world!\n";
std::locale loc(std::locale::classic(),
new std::codecvt<char, char, std::__enc_traits>());
std::__enc_traits st("ISO-8859-1", "ISO-8859-1");
@@ -39,8 +40,8 @@
int s = fb.pubsync();
fb.close();
- assert(n == std::strlen(str));
- assert(s == 0);
+ VERIFY( n == std::strlen(str) );
+ VERIFY( s == 0 );
#endif
return 0;