libstdc++.exp (dg-test): Annotate result messages with $which_library as well as $tool_flags and...

* testsuite/lib/libstdc++.exp (dg-test): Annotate result
	messages with $which_library as well as $tool_flags and
	${dg-extra-tool-flags}.  Factor out annotation text into
	a single variable.

From-SVN: r41029
This commit is contained in:
Zack Weinberg 2001-04-02 23:40:01 +00:00
parent b6dabe8938
commit 9f4a318c36
2 changed files with 177 additions and 166 deletions

View File

@ -1,3 +1,10 @@
2001-04-02 Zack Weinberg <zackw@stanford.edu>
* testsuite/lib/libstdc++.exp (dg-test): Annotate result
messages with $which_library as well as $tool_flags and
${dg-extra-tool-flags}. Factor out annotation text into
a single variable.
2001-04-02 Stephen M. Webb <stephen@bregmasoft.com>
* include/c_std/bits/std_cstring.h: Fix for const-correctness.
@ -94,19 +101,19 @@
* acinclude.m4 (GLIBCPP_ENABLE_SJLJ_EXCEPTIONS): New.
* configure.in: Use it.
* Makefile.in, aclocal.m4, config.h.in, configure: Regenerate.
* libsupc++/Makefile.am (sources): Update files list.
* libsupc++/Makefile.in: Regenerate.
* libsupc++/eh_alloc.cc, libsupc++/eh_aux_runtime.cc: New files.
* libsupc++/eh_catch.cc, libsupc++/eh_exception.cc: New files.
* libsupc++/Makefile.am (sources): Update files list.
* libsupc++/Makefile.in: Regenerate.
* libsupc++/eh_alloc.cc, libsupc++/eh_aux_runtime.cc: New files.
* libsupc++/eh_catch.cc, libsupc++/eh_exception.cc: New files.
* libsupc++/eh_globals.cc, libsupc++/eh_personality.cc: New files.
* libsupc++/eh_terminate.cc, libsupc++/eh_throw.cc: New files.
* libsupc++/exception_support.cc: Remove.
* libsupc++/exception_support.h: Remove.
* libsupc++/pure.cc: Use std::terminate.
* libsupc++/tinfo2.cc (__throw_type_match_rtti_2): Remove.
(__is_pointer): Remove.
* libsupc++/unwind-cxx.h: New file.
* libsupc++/vec.cc (uncatch_exception): Update for new abi.
* libsupc++/eh_terminate.cc, libsupc++/eh_throw.cc: New files.
* libsupc++/exception_support.cc: Remove.
* libsupc++/exception_support.h: Remove.
* libsupc++/pure.cc: Use std::terminate.
* libsupc++/tinfo2.cc (__throw_type_match_rtti_2): Remove.
(__is_pointer): Remove.
* libsupc++/unwind-cxx.h: New file.
* libsupc++/vec.cc (uncatch_exception): Update for new abi.
2001-03-27 Alexandre Oliva <aoliva@redhat.com>
@ -121,8 +128,8 @@
2001-03-26 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
* libstdc++-v3/tests_flags.in: Change the order of libstdc++
and libc
* libstdc++-v3/tests_flags.in: Change the order of libstdc++
and libc
2001-03-26 Benjamin Kosnik <bkoz@redhat.com>
@ -245,7 +252,7 @@
2001-03-13 Andris Pavenis <pavenis@latnet.lv>
* config/djgpp/bits/ctype_noninline.h: Fix typo and remove
* config/djgpp/bits/ctype_noninline.h: Fix typo and remove
duplicate definitions of __dj_ctype_*
2001-03-13 Benjamin Kosnik <bkoz@redhat.com>
@ -278,8 +285,8 @@
2001-03-12 Rodney Brown <RodneyBrown@mynd.com>
* src/gen-num-limits.cc (traps) [SPECIALIZE_TRAPPING]: Add fflush
prior to trapping signal (UnixWare 7 workaround).
* src/gen-num-limits.cc (traps) [SPECIALIZE_TRAPPING]: Add fflush
prior to trapping signal (UnixWare 7 workaround).
2001-03-12 Craig Rodrigues <rodrigc@mediaone.net>
@ -296,8 +303,8 @@
2001-03-11 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
* include/ext/stl_hashtable.h: Change type of __n to size_t
* include/backward/bvector.h: Include <ext/stl_bvector.h>
* include/ext/stl_hashtable.h: Change type of __n to size_t
* include/backward/bvector.h: Include <ext/stl_bvector.h>
2001-03-09 Gabriel Dos Reis <gdr@merlin.codesourcery.com>
@ -314,7 +321,7 @@
* acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Fix syntax in test
command.
* aclocal.m4, configure: Regenerated.
* aclocal.m4, configure: Regenerated.
2001-03-07 Benjamin Kosnik <bkoz@redhat.com>
@ -342,14 +349,14 @@
2001-03-07 Alexandre Oliva <aoliva@redhat.com>
Add Irix 5.2, 6.3 support.
* config/os/irix/bits: Renamed to...
* config/os/irix/irix6.5/bits: this.
* config/os/irix/irix5.2/bits: New, copied from irix6.5/bits.
* config/os/irix/irix5.2/bits/ctype_base.h: Use _U, _L, _N,
_X, _S, _P, _C and _B instead of IRIX-6.5 _IS* macros.
* config/os/irix/irix5.2/bits/ctype_noninline.h
(ctype<char>::ctype): Initialize _M_table with __ctype.
* configure.target: Adjust.
* config/os/irix/bits: Renamed to...
* config/os/irix/irix6.5/bits: this.
* config/os/irix/irix5.2/bits: New, copied from irix6.5/bits.
* config/os/irix/irix5.2/bits/ctype_base.h: Use _U, _L, _N,
_X, _S, _P, _C and _B instead of IRIX-6.5 _IS* macros.
* config/os/irix/irix5.2/bits/ctype_noninline.h
(ctype<char>::ctype): Initialize _M_table with __ctype.
* configure.target: Adjust.
2001-03-06 Benjamin Kosnik <bkoz@redhat.com>
@ -377,9 +384,9 @@
2001-03-05 scott snyder <snyder@fnal.gov>
libstdc++/2190
* include/c_std/bits/std_cmath.h: Move abs(long), div(long,long)
from here...
* include/c_std/bits/std_cstdlib.h: ... to here.
* include/c_std/bits/std_cmath.h: Move abs(long), div(long,long)
from here...
* include/c_std/bits/std_cstdlib.h: ... to here.
* testsuite/17_intro/header_cstdlib.cc: Add test.
2001-03-05 Stephen M. Webb <stephen.webb@cybersafe.com>
@ -388,7 +395,7 @@
2001-03-05 Laurynas Biveinis <lauras@softhome.net>
* config/os/djgpp/ctype_base.h (ctype_base): fix __to_type
* config/os/djgpp/ctype_base.h (ctype_base): fix __to_type
definition. Replace enum with static const variables.
* config/os/djgpp/ctype_inline.h (ctype<char>::is): remove
@ -514,7 +521,7 @@
2001-03-02 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
* include/bits/istream.tcc: change type of __extracted to __size_type
* include/bits/istream.tcc: change type of __extracted to __size_type
2001-03-02 Benjamin Kosnik <bkoz@redhat.com>
@ -528,8 +535,8 @@
2001-03-02 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
* src/locale.cc: initialise __ret with zero
* src/strstream.cc:cast gptr to int_type
* src/locale.cc: initialise __ret with zero
* src/strstream.cc:cast gptr to int_type
2001-03-01 Phil Edwards <pme@sources.redhat.com>
@ -778,26 +785,26 @@
2001-02-16 Greg Bumgardner <bumgard@roguewave.com>
libstdc++/1734
* include/bits/std_ostream.h: Replaced usage of
_Traits::_S_eos() with _CharT() as per section 17.2.2.1.3.
* include/bits/char_traits.h: Removed non-standard
methods that cannot be used elsewhere.
* include/bits/std_ostream.h: Replaced usage of
_Traits::_S_eos() with _CharT() as per section 17.2.2.1.3.
* include/bits/char_traits.h: Removed non-standard
methods that cannot be used elsewhere.
libstdc++/1885
* include/bits/basic_ios.h: Uncommented #include of
bits/basic_ios.tcc
* include/bits/basic_ios.h: Uncommented #include of
bits/basic_ios.tcc
libstdc++/1897
* include/bits/codecvt.h: See next...
* include/bits/fstream.tcc: See next...
* include/bits/ostream.tcc: Add __extension__
to variable-length arrays.
* include/bits/codecvt.h: See next...
* include/bits/fstream.tcc: See next...
* include/bits/ostream.tcc: Add __extension__
to variable-length arrays.
libstdc++/1967
* include/bits/localefwd.h: Changed int counter type to size_t.
* include/bits/localefwd.h: Changed int counter type to size_t.
libstdc++/1968
* include/bits/std_fstream.h: Added typedef for __ctype_type.
* include/bits/std_fstream.h: Added typedef for __ctype_type.
2001-02-16 Benjamin Kosnik <bkoz@redhat.com>
@ -824,24 +831,24 @@
2001-02-15 Jeffrey Oldham <oldham@codesourcery.com>
* include/bits/c++config (_GLIBCPP_FULLY_COMPLIANT_HEADERS):
Define so library is compliant.
* include/bits/c++config (_GLIBCPP_FULLY_COMPLIANT_HEADERS):
Define so library is compliant.
2001-02-15 Anthony Green <green@redhat.com>
* acinclude.m4 (glibcpp_toolexeclibdir): Fix test for cross
compilation.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* acinclude.m4 (glibcpp_toolexeclibdir): Fix test for cross
compilation.
* aclocal.m4: Regenerate.
* configure: Regenerate.
2001-02-15 Rodney Brown <RodneyBrown@mynd.com>
* acinclude.m4 (GLIBCPP_CHECK_MATH_DECL_1):
Include ieeefp.h for fpclass on UnixWare{2,7}.
* acinclude.m4 (GLIBCPP_CHECK_MATH_DECL_1):
Include ieeefp.h for fpclass on UnixWare{2,7}.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* mkcheck.in (size_command): Do without GNU-grep when using
size from binutils.
* mkcheck.in (size_command): Do without GNU-grep when using
size from binutils.
2001-02-15 Mark Mitchell <mark@codesourcery.com>
@ -951,7 +958,7 @@
2001-02-15 Gabriel Dos Reis <gdr@codesourcery.com>
* testsuite/lib/libstdc++.exp: Lift, temporarily, out of
dejagnu/dg.exp. Adapt to log options used to run testcases.
dejagnu/dg.exp. Adapt to log options used to run testcases.
2001-02-13 Gabriel Dos Reis <gdr@merlin.codesourcery.com>
@ -959,7 +966,7 @@
dejagnu/dg.exp.
2001-02-13 Dirk Mueller <dmuell@gmx.net>
Phil Edwards <pme@sources.redhat.com>
Phil Edwards <pme@sources.redhat.com>
* include/backward/function.h: Do not use rel_ops for older
headers either.
@ -1013,7 +1020,7 @@
2001-02-08 Loren J. Rittle <ljrittle@acm.org>
* src/locale-inst.cc (fill_n): Instantiate with size_t arguments.
* src/locale-inst.cc (fill_n): Instantiate with size_t arguments.
2001-02-08 David Edelsohn <edelsohn@gnu.org>
@ -1093,7 +1100,7 @@
(_S_copy_streambufs): Likewise.
2001-02-06 Hyman Rosen <Hyman.Rosen@kbcfp.com>
Phil Edwards <pme@sources.redhat.com>
Phil Edwards <pme@sources.redhat.com>
* include/bits/std_istream.h (op>> signed,unsigned char): Must
use reinterpret_cast, not static_cast.
@ -1188,13 +1195,13 @@
* libsupc++/tinfo2.cc (std::typeinfo::before): Likewise.
2001-02-03 Alexandre Oliva <aoliva@redhat.com>
Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
* Makefile.am (mkinstalldirs): Set.
* src/Makefile.am (mkinstalldirs): Set.
* libmath/Makefile.am (mkinstalldirs): Set.
* libsup++/Makefile.am (mkinstalldirs): Set.
* libio/Makefile.am (mkinstalldirs): Set.
* Makefile.am (mkinstalldirs): Set.
* src/Makefile.am (mkinstalldirs): Set.
* libmath/Makefile.am (mkinstalldirs): Set.
* libsup++/Makefile.am (mkinstalldirs): Set.
* libio/Makefile.am (mkinstalldirs): Set.
* */Makefile.in: Regenerate.
2001-02-03 Benjamin Kosnik <bkoz@redhat.com>
@ -1347,8 +1354,8 @@
2001-01-25 Loren J. Rittle <ljrittle@acm.org>
* testsuite/21_strings/inserters_extractors.cc: Remove
explicit reference to 'testsuite/'.
* testsuite/21_strings/inserters_extractors.cc: Remove
explicit reference to 'testsuite/'.
2001-01-25 Richard Henderson <rth@redhat.com>
@ -1443,15 +1450,15 @@
2001-01-23 Mark Mitchell <mark@codesourcery.com>
* ainclude.m4 (GLIBCPP_CHEC_MATH_DECLS_AND_LINKAGE_1): New macro.
(GLIBCPP_CHECK_MATH_SUPPORT): Use it.
(GLIBCPP_CHECK_TYPE_SUPPORT): Don't autoconf ctype information if
its already provided in config.target.
* aclocal.m4: Regenerated.
* configure: Likewise.
* configure.target: Set ctype_include_dir for lots of systems.
* libsupc++/Makefile.am: Explicitly include --tag disable-shared.
* libsupc++/Makefile.in: Regenerated.
* ainclude.m4 (GLIBCPP_CHEC_MATH_DECLS_AND_LINKAGE_1): New macro.
(GLIBCPP_CHECK_MATH_SUPPORT): Use it.
(GLIBCPP_CHECK_TYPE_SUPPORT): Don't autoconf ctype information if
its already provided in config.target.
* aclocal.m4: Regenerated.
* configure: Likewise.
* configure.target: Set ctype_include_dir for lots of systems.
* libsupc++/Makefile.am: Explicitly include --tag disable-shared.
* libsupc++/Makefile.in: Regenerated.
2001-01-23 Gabriel Dos Reis <gdr@codesourcery.com>
@ -1490,10 +1497,10 @@
2001-01-17 Loren J. Rittle <ljrittle@acm.org>
* mkcheck.in: Construct file names that match $objdir structure.
* testsuite/27_io/filebuf_members-1.txt: New file.
* testsuite/27_io/ifstream_members-1.txt: New file.
* testsuite/27_io/ostream_inserter_char-1.txt: New file.
* mkcheck.in: Construct file names that match $objdir structure.
* testsuite/27_io/filebuf_members-1.txt: New file.
* testsuite/27_io/ifstream_members-1.txt: New file.
* testsuite/27_io/ostream_inserter_char-1.txt: New file.
* testsuite/27_io/ios_base_members_static.cc (test02): Add test.
* testsuite/27_io/ios_base_members_static-1.tst: Add expected output.
@ -1507,13 +1514,13 @@
libstdc++/1605
* include/bits/ios_base.h (ios_base::failure): Tighten up throw specs.
* src/ios.cc (ios_base::failure): Make definitions match.
* libsupc++/typeinfo (class bad_typeid): Add throw specs.
(class bad_cast): Same.
* libsupc++/exception (class exception): Add throw specs.
* libsupc++/exception_support.cc (set_terminate): Add throw specs.
(set_unexpected): Same.
(uncaught_exception): Same.
(what): Same.
* libsupc++/typeinfo (class bad_typeid): Add throw specs.
(class bad_cast): Same.
* libsupc++/exception (class exception): Add throw specs.
* libsupc++/exception_support.cc (set_terminate): Add throw specs.
(set_unexpected): Same.
(uncaught_exception): Same.
(what): Same.
* docs/html/17_intro/C++STYLE (classname): Fix.
@ -1599,10 +1606,10 @@
2001-01-10 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
* include/bits/std_complex.h: Fix a typo.
* include/bits/std_complex.h: Fix a typo.
2001-01-09 Benjamin Kosnik <bkoz@redhat.com>
<kainz@ilm.com>
<kainz@ilm.com>
Fixes for libstdc++/1576
* src/stdstreams.cc: Initialize with NULL filebuf. Delete
@ -1620,7 +1627,7 @@
2001-01-09 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
* include/bits/std_complex.h: Fix a typo.
* include/bits/std_complex.h: Fix a typo.
2001-01-09 Loren J. Rittle <ljrittle@acm.org>
@ -1671,8 +1678,8 @@
2001-01-04 Loren J. Rittle <ljrittle@acm.org>
* config/c_io_stdio.cc (__basic_file<_CharT>::sys_open()): On
systems that support it, call dup() before fdopen().
* config/c_io_stdio.cc (__basic_file<_CharT>::sys_open()): On
systems that support it, call dup() before fdopen().
2001-01-03 Benjamin Kosnik <bkoz@redhat.com>

View File

@ -326,6 +326,7 @@ proc dg-test { args } {
global tool
global srcdir ;# eg: /calvin/dje/devo/gcc/./testsuite/
global host_triplet target_triplet
global which_library
set keep 0
set i 0
@ -411,6 +412,9 @@ proc dg-test { args } {
rename unknown ""
rename dg-save-unknown unknown
# Record the final set of flags, to tag log entries with.
set label "$which_library $tool_flags ${dg-extra-tool-flags}"
# If we're not supposed to try this test on this target, we're done.
if { [lindex ${dg-do-what} 1] == "N" } {
unsupported "$name"
@ -458,28 +462,28 @@ proc dg-test { args } {
scan $line ${dg-linenum-format} line
switch [lindex $i 1] {
"ERROR" {
$ok "$name $comment (test for errors, line $line), $tool_flags ${dg-extra-tool-flags}"
$ok "$name $comment (test for errors, line $line), $label"
}
"XERROR" {
x$ok "$name $comment (test for errors, line $line), $tool_flags ${dg-extra-tool-flags}"
x$ok "$name $comment (test for errors, line $line), $label"
}
"WARNING" {
$ok "$name $comment (test for warnings, line $line), $tool_flags ${dg-extra-tool-flags}"
$ok "$name $comment (test for warnings, line $line), $label"
}
"XWARNING" {
x$ok "$name $comment (test for warnings, line $line), $tool_flags ${dg-extra-tool-flags}"
x$ok "$name $comment (test for warnings, line $line), $label"
}
"BOGUS" {
$uhoh "$name $comment (test for bogus messages, line $line), $tool_flags ${dg-extra-tool-flags}"
$uhoh "$name $comment (test for bogus messages, line $line), $label"
}
"XBOGUS" {
x$uhoh "$name $comment (test for bogus messages, line $line), $tool_flags ${dg-extra-tool-flags}"
x$uhoh "$name $comment (test for bogus messages, line $line), $label"
}
"BUILD" {
$uhoh "$name $comment (test for build failure, line $line), $tool_flags ${dg-extra-tool-flags}"
$uhoh "$name $comment (test for build failure, line $line), $label"
}
"XBUILD" {
x$uhoh "$name $comment (test for build failure, line $line), $tool_flags ${dg-extra-tool-flags}"
x$uhoh "$name $comment (test for build failure, line $line), $label"
}
"EXEC" { }
"XEXEC" { }
@ -526,10 +530,10 @@ proc dg-test { args } {
setup_xfail "*-*-*"
}
if ![string match "" $comp_output] {
fail "$name (test for excess errors), $tool_flags ${dg-extra-tool-flags}"
fail "$name (test for excess errors), $label"
send_log "Excess errors:\n$comp_output\n"
} else {
pass "$name (test for excess errors), $tool_flags ${dg-extra-tool-flags}"
pass "$name (test for excess errors), $label"
}
}
@ -549,7 +553,7 @@ proc dg-test { args } {
setup_xfail "*-*-*"
}
if { "$status" == "pass" } {
pass "$name (execution test), $tool_flags ${dg-extra-tool-flags}"
pass "$name (execution test), $label"
verbose "Exec succeeded." 3
if { [llength ${dg-output-text}] > 1 } {
#send_user "${dg-output-text}\n"
@ -573,9 +577,9 @@ proc dg-test { args } {
} else {
verbose "Exec failed, errorCode not defined!" 3
}
fail "$name (execution test), $tool_flags ${dg-extra-tool-flags}"
fail "$name (execution test), $label"
} else {
$status "$name (execution test), $tool_flags ${dg-extra-tool-flags}"
$status "$name (execution test), $label"
}
}
}