[Bug-dejagnu] Re: DejaGnu import

[Nick Clifton]

Hi Ben, Hi Rob,

> Ben Elliston writes:
>
> I see from cvs log output that you are the person who normally imports
> DejaGnu releases into the son-of-devo (src) tree.  If that is correct,
> then the following patch, will re-incorporate a handful of local
> miscellaneous patches from src/dejagnu that were not submitted to the
> Savannah tree.
>
> I have now committed this set of patches to the Savannah tree so that
> they will not be lost again, but they did not make it into 1.4.4.  If
> you apply this patch, you can sleep at night :-)


I do not actually have write permission on the dejagnu repository, but
I will submit this patch to the dejagnu list and hope that Rob will
accept it.

Rob - can this patch be applied please ?

Cheers
        Nick

ChangeLog
2004-01-30  Ben Elliston  <address@hidden>
 
        Import orphaned patches from sources.redhat.com:

        2002-05-02  Fernando Nasser  <address@hidden>
        * doc/dejagnu.texi: Document KFAIL and KPASS.

        2002-02-20  Richard Henderson  <address@hidden>
        * lib/target.exp (prune_warnings): Revert early "In function" strip,
        as this breaks g++.dg tests.  Match dangerous regexp without the
        "In function" header.

        2002-02-09  Richard Henderson  <address@hidden>
        * lib/target.exp (prune_warnings): Strip "In function" etc early.
        Adjust "dangerous" regexp for glibc's tmpnam warning.

        2001-09-10  Jim Blandy  <address@hidden>
        * baseboards/rom68k-idp.exp: Use -Tidpgdb.ld as the linker script,
        so we get the version of the `outbyte' function that does console
        output in a way that GDB's rom68k target recognizes.  Note that
        the board can now do output.

        2000-04-25  Felix Lee  <address@hidden>
        * baseboards/tx39-sim.exp: Use idt, not dve linker script.  Delete
        misleading comments and null statements.
---------------------------------------------------------------------------
Index: ChangeLog.0
===================================================================
RCS file: /cvsroot/dejagnu/dejagnu/ChangeLog.0,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ChangeLog.0 30 Jan 2004 04:17:03 -0000      1.4
+++ ChangeLog.0 30 Jan 2004 06:24:00 -0000      1.5
@@ -138,7 +138,7 @@ Wed Jun  5 14:52:15 PDT 2002   Joey Ekst
 
         * added documentation on xml capabilities
 
-2002-05-02  Fernando Nasser  <address@hidden>
+2002-05-02  Fernando Nasser  <address@hidden>
 
         * runtest.exp: Add kfail_flag and kfail_prms variable
         initializations.
Index: runtest.exp
===================================================================
RCS file: /cvsroot/dejagnu/dejagnu/runtest.exp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- runtest.exp 30 Jan 2004 04:17:03 -0000      1.19
+++ runtest.exp 30 Jan 2004 06:24:00 -0000      1.20
@@ -1194,7 +1194,6 @@ for { set i 0 } { $i < $argc } { incr i 
            exit 1
        }
     }
-
 }
 
 #
Index: baseboards/rom68k-idp.exp
===================================================================
RCS file: /cvsroot/dejagnu/dejagnu/baseboards/rom68k-idp.exp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- baseboards/rom68k-idp.exp   23 Aug 2003 01:16:51 -0000      1.3
+++ baseboards/rom68k-idp.exp   30 Jan 2004 06:24:00 -0000      1.4
@@ -63,8 +63,9 @@ if ![board_info $board exists output_for
     unset tempfil
 }
 
-# IDP linker script.
-set_board_info ldscript "-Wl,-Tidp.ld"
+# IDP linker script, with special console output routine for GDB.
+set_board_info ldscript "-Wl,-Tidpgdb.ld"
+
 # The idt interface can't return exit statuses, so gcc (ctorture et
 # al) needs to do what it can to get them.
 set_board_info needs_status_wrapper 1
@@ -74,9 +75,6 @@ set_board_info gdb_protocol  "rom68k"
 
 # Can't pass arguments to the program under test.
 set_board_info noargs 1
-
-# Nor can it do I/O in GDB.
-set_board_info gdb,noinferiorio 1
 
 # It has no signals.
 set_board_info gdb,nosignals 1
Index: baseboards/tx39-sim.exp
===================================================================
RCS file: /cvsroot/dejagnu/dejagnu/baseboards/tx39-sim.exp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- baseboards/tx39-sim.exp     23 Aug 2003 01:16:51 -0000      1.4
+++ baseboards/tx39-sim.exp     30 Jan 2004 06:24:00 -0000      1.5
@@ -17,11 +17,6 @@
 # along with DejaGnu; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-# We need mips16.
-add_multilib_option ""
-
-# And we use the lsi linker script.
-set_board_info ldscript "-Wl,-Tdve.ld"
-
-# Otherwise we're the same as the standard MIPS simulator.
-load_base_board_description "mips-sim"
+# This file is unnecessary, but we'll keep it for now.
+# We're the same as the standard MIPS simulator.
+load_base_board_description "mips-sim";
Index: baseboards/unix.exp
===================================================================
RCS file: /cvsroot/dejagnu/dejagnu/baseboards/unix.exp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- baseboards/unix.exp 23 Aug 2003 01:16:51 -0000      1.8
+++ baseboards/unix.exp 30 Jan 2004 06:24:00 -0000      1.9
@@ -26,10 +26,6 @@ set_board_info compiler  "[find_gcc]"
 
 set_board_info bmk,use_alarm 1
 
-# Set host_library_path to pick up libs such as libstdc++
-
-#set_board_info host_library_path "[file dirname [file dirname [file dirname 
[file dirname [file dirname [exec [find_gcc] --print-prog-name=cc1]]]]]]/lib"
-
 # Do not use -lm on Cygwin
 if { [istarget "*-*-cygwin*"] } {
     set_board_info mathlib ""
@@ -39,4 +35,3 @@ if { [istarget "*-*-cygwin*"] } {
 if { [istarget "alpha*-*"] } {
     set_board_info ieee_multilib_flags "-mieee"
 }
-
Index: doc/dejagnu.texi
===================================================================
RCS file: /cvsroot/dejagnu/dejagnu/doc/dejagnu.texi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- doc/dejagnu.texi    17 Aug 2003 23:00:07 -0000      1.10
+++ doc/dejagnu.texi    30 Jan 2004 06:24:00 -0000      1.11
@@ -683,6 +683,14 @@ A pleasant kind of failure: a test was k
 This may indicate progress; inspect the test case to determine whether
 you should amend it to stop expecting failure.
 
address@hidden KPASS
address@hidden KPASS
address@hidden successful test, unexpected
address@hidden unexpected success
+A pleasant kind of failure: a test was known to fail, but succeeded.
+This may indicate progress; inspect the test case to determine whether
+you should amend it to stop expecting failure.
+
 @item FAIL
 @kindex FAIL
 @cindex failing test, unexpected
@@ -2058,6 +2066,15 @@ for a particular set of configurations. 
 list of configuration target names.  It is only necessary to call
 @code{clear_xfail} if a test case ends without calling either
 @code{pass} or @code{fail}, after calling @code{setup_xfail}.
+
address@hidden clear_kfail @var{config}
address@hidden cancelling known failure
address@hidden known failure, cancelling
+Cancel a known failure (previously declared with @code{setup_kfail})
+for a particular set of configurations.  The @var{config} argument is a
+list of configuration target names.  It is only necessary to call
address@hidden if a test case ends without calling either
address@hidden or @code{fail}, after calling @code{setup_kfail}.
 
 @item clear_kfail @var{config}
 @cindex cancelling known failure
Index: lib/target.exp
===================================================================
RCS file: /cvsroot/dejagnu/dejagnu/lib/target.exp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- lib/target.exp      23 Aug 2003 05:55:08 -0000      1.13
+++ lib/target.exp      30 Jan 2004 06:24:00 -0000      1.14
@@ -268,16 +268,23 @@ proc prune_warnings { text } {
     regsub -all "(^|\n)(\[^\n\]*: warning: reference to compatibility 
glob\[^\n\]*\n?)" $text "\\1" text
 
     # GNU ld warns about functions marked as dangerous in GNU libc.
-    regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*function 
is dangerous\[^\n\]*" $text "" text
-
-     # GNU ld warns about functions marked as dangerous in GNU libc.
+    regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*is 
dangerous\[^\n\]*" $text "" text
      regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*the use 
of \[^\n\]* is dangerous, better use \[^\n\]*" $text "" text
+    regsub -all "(^|\n)\[^\n\]*is dangerous\[^\n\]*" $text "" text
 
      # Libgloss libnosys defines functions that warn when linked in
     regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*is not 
implemented and will always fail\[^\n\]*" $text "" text
+    regsub -all "(^|\n)\[^\n\]*is not implemented and will always 
fail\[^\n\]*" $text "" text
+
+    # libstdc++-v3 tests can emit cpplib warnings due to duplicate -isystem / 
-I flags
+    regsub -all "(^|\n)\[^\n\]*: warning: changing search order for system 
directory\[^\n\]*" $text "" text
+    regsub -all "(^|\n)\[^\n\]*: warning:   as it has already been 
specified\[^\n\]*" $text "" text
 
     # Cygwin cc1 warns about -fpic and -fPIC
-    regsub -all ".*: warning: -f(pic|PIC) ignored for target .*" $text "" text
+    regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC) ignored for target 
\[^\n\]*" $text "" text
+
+    # Ignore linker warning when searching 64bit libraries in /lib.
+    regsub -all "(^|\n)\[^\n\]*: skipping incompatible \[^\n\]* when searching 
for \[^\n\]*" $text "" text
 
     # It might be tempting to get carried away and delete blank lines, etc.
     # Just delete *exactly* what we're ask to, and that's it.