diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-14 19:59:26 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-14 19:59:26 +0000 |
| commit | 43a8c05a0a7d26fc4f642cf3dd01066a8312c0b5 (patch) | |
| tree | 89c1a03a93a8b23be6764562273f344faabf7acc /libstdc++-v3/testsuite/25_algorithms | |
| parent | bc8459dd1f1f9b5a164b5e9fba013dbd4709c73a (diff) | |
| download | ppe42-gcc-43a8c05a0a7d26fc4f642cf3dd01066a8312c0b5.tar.gz ppe42-gcc-43a8c05a0a7d26fc4f642cf3dd01066a8312c0b5.zip | |
2000-08-14 Brent Verner <brent@rcfile.org>
* testsuite/debug_assert.h: new file
* testsuite/*/*.cc: s/test\s*&=([^;]+);/VERIFY($1);/g
changed conditional #include <c?assert.?h?> to
unconditional #include <debug_assert.h>
* mkcheck.in: added $SRC_DIR/testsuite to include search path
for testsuite compile command.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35682 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/testsuite/25_algorithms')
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/lower_bound.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/min_max.cc | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc b/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc index bd8813593d3..c6e12dcc38a 100644 --- a/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc +++ b/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc @@ -17,9 +17,7 @@ // USA. #include <algorithm> -#ifdef DEBUG_ASSERT -#include <assert.h> -#endif +#include <debug_assert.h> // http://sourceware.cygnus.com/ml/libstdc++/2000-06/msg00316.html struct foo { }; diff --git a/libstdc++-v3/testsuite/25_algorithms/min_max.cc b/libstdc++-v3/testsuite/25_algorithms/min_max.cc index a5219bf80b1..04cd6302a34 100644 --- a/libstdc++-v3/testsuite/25_algorithms/min_max.cc +++ b/libstdc++-v3/testsuite/25_algorithms/min_max.cc @@ -19,22 +19,20 @@ // USA. #include <algorithm> -#ifdef DEBUG_ASSERT -#include <assert.h> -#endif +#include <debug_assert.h> void test01() { bool test = true; const int& x = std::max(1, 2); const int& y = std::max(3, 4); - test &= x == 2; - test &= y == 4; + VERIFY( x == 2 ); + VERIFY( y == 4 ); const int& z = std::min(1, 2); const int& w = std::min(3, 4); - test &= z == 1; - test &= w == 3; + VERIFY( z == 1 ); + VERIFY( w == 3 ); #ifdef DEBUG_ASSERT assert(test); |
