[patch] libio check

[patch] libio check

[Bruno Haible]

Hi,

Doing "make check" in libraries/libio/ produces the following output on
i486-linux:


cd stdio; make check ...
make[2]: Entering directory `/usr2/packages/gnu/egcs-980214/libraries/libio/stdio'
make[2]: Nothing to be done for `check'.
make[2]: Leaving directory `/usr2/packages/gnu/egcs-980214/libraries/libio/stdio'
cd testsuite; make check ...
make[2]: Entering directory `/usr2/packages/gnu/egcs-980214/libraries/libio/testsuite'
Making a new config file...
rootme=`pwd`; export rootme; \
srcdir=. ; export srcdir ; \
EXPECT=`if [ -f ${rootme}/../../expect/expect ] ; then echo ${rootme}/../../expect/expect ; else echo expect ; fi` ; export EXPECT ; \
if [ -f ${rootme}/../../expect/expect ] ; then  \
  TCL_LIBRARY=${srcdir}/../../tcl/library ; \
  export TCL_LIBRARY ; fi ; \
` if [ -f ${srcdir}/../../dejagnu/runtest ]; then echo ${srcdir}/../../dejagnu/runtest; else if [ "i486-pc-linux-gnulibc1" = "i486-pc-linux-gnulibc1" ]; then echo runtest; else t=''; echo runtest | sed -e '' $t; fi; fi`  
WARNING: Couldn't find the global config file.
Test Run By bin on Sat Feb 28 12:53:49 1998
Native configuration is i486-pc-linux-gnulibc1

                === libio tests ===

Running target unix
Using /usr/local/bin/../share/dejagnu/baseboards/unix.exp as board description file for target.
Using /usr/local/bin/../share/dejagnu/config/unix.exp as generic interface file for target.
Using ./config/default.exp as tool-and-target-specific interface file.
Running ./libio.tests/hounddog.exp ...
Running ./libio.tests/putbackdog.exp ...
i486-linux
Running ./libio.tests/tFile.exp ...
i486-linux
Running ./libio.tests/tfformat.exp ...
FAIL: tfformat.c compilation 
Running ./libio.tests/tiformat.exp ...
FAIL: tiformat.c compilation 
Running ./libio.tests/tiomanip.exp ...
Running ./libio.tests/tiomisc.exp ...
Running ./libio.tests/tstdiomisc.exp ...
FAIL: tstdiomisc.c compilation 

                === libio Summary ===

# of expected passes            33
# of unexpected failures        3
# of expected failures          4


The problems come from command lines like this one:
/packages/gnu/egcs-980214/gcc/xgcc -B/packages/gnu/egcs-980214/gcc/ \
  ./../tests/tfformat.c  -O3 -I.. -I./..  -DTEST_LIBIO -DTEST_EXACTNESS  \
  -L/usr2/packages/gnu/egcs-980214/libraries/libiberty -g \
  -lio -liberty  -lm  \
 -o /usr2/packages/gnu/egcs-980214/libraries/libio/testsuite/tfformat

/usr/bin/ld: cannot open -lio: No such file or directory
collect2: ld returned 1 exit status

Here is a patch to fix this. With this patch, the results are:

                === libio Summary ===

# of expected passes            40


Sat Feb 28 16:19:16 1998  Bruno Haible  <bruno@linuix.mathematik.uni-karlsruhe.de>

        * libio.exp (test_libio): For C tests, search for libio.a the same
          way as for libiberty.a.

*** egcs-980214/libio/testsuite/lib/libio.exp.bak	Sat Dec 20 01:16:03 1997
--- egcs-980214/libio/testsuite/lib/libio.exp	Sat Feb 28 16:00:52 1998
***************
*** 63,68 ****
--- 63,70 ----
  	lappend args "additional_flags=$compile_args"
      }
  
+     set gp [get_multilibs];
+ 
      if [regexp "\.cc$" $srcfile] {
  	lappend args "additional_flags=-nostdinc++"
  	lappend args "additional_flags=[libstdc++_include_flags]";
***************
*** 72,78 ****
  	if [info exists LIBIO] {
  	    lappend args "libdir=$LIBIO"
  	} else {
! 	    lappend args "additional_flags=[libio_link_flags]";
  	}
  	lappend args "additional_flags=[libio_link_flags]";
  	lappend args "libs=-lio"
--- 74,92 ----
  	if [info exists LIBIO] {
  	    lappend args "libdir=$LIBIO"
  	} else {
! 	    # Search for libio.a
! 	    if { $gp != "" } {
! 		if [file exists $gp/libio/libio.a] {
! 		    lappend args "libdir=$gp/libio";
! 		    set found_libio 1;
! 		}
! 	    }
! 	    if ![info exists found_libio] {
! 		set lib [lookfor_file "$objdir" "libio/libio.a"];
! 		if { $lib != "" } {
! 		    lappend args "libdir=[file dirname $lib]";
! 		}
! 	    }
  	}
  	lappend args "additional_flags=[libio_link_flags]";
  	lappend args "libs=-lio"
***************
*** 86,92 ****
  	lappend args "additional_options=$TOOL_OPTIONS"
      }
  
!     set gp [get_multilibs];
      if { $gp != "" } {
  	if [file exists $gp/libiberty/libiberty.a] {
  	    lappend args "libdir=$gp/libiberty";
--- 100,106 ----
  	lappend args "additional_options=$TOOL_OPTIONS"
      }
  
!     # Search for libiberty.a
      if { $gp != "" } {
  	if [file exists $gp/libiberty/libiberty.a] {
  	    lappend args "libdir=$gp/libiberty";
***************
*** 100,105 ****
--- 114,120 ----
  	}
      }
      lappend args "libs=-liberty"
+ 
      lappend args "debug";
  
      set errname "$srcfile"