This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[v3] testsuite bits



I'd like to cut over, if that's ok. I'm pretty close on the
libgloss/sid support, and the native support is completely on it, so it makes
sense to me at least.

Gaby? What say you? Thanks for the testsuite_flags catch.

I'm up for the fancy directory structure in the build/test directory,
but lack the will given the rest of the complexity I'm dealing with at
the moment. I'm thinking this elaborated directory structure and
static/shared support can be added later relatively painlessly?

best,
benjamin

tested x86-linux
tested x86-linux x powerpc-eabism (sim/libgloss)
tested x86-linux x xscale-elf (sim/newlib)
tested x86-linux x calmrisc32-elf (sid/libgloss)

2001-05-12   Benjamin Kosnik  <bkoz@redhat.com>

	Switch over to new harness.
	* testsuite_flags.in: Tweaks via Gaby.
	* testsuite/Makefile.am: Change tool to libstdc++-v3.
	(EXPECT): Quote directly.
	(RUNTEST): Same.
	* configure.in: Output testsuite_flags.
	* acinclude.m4: Substitute src, bld, and prefix dirs.
	Remove glibcpp_expect, glibcpp_runtestflags.
	* Makefile.am (RUNTESTFLAGS): Pass this down to subdirs.
	
	* aclocal.m4: Regerate.
	* configure: Regnerate.
	* Makefile.in: Regnerate.
	* */Makefile.in: Regenerate.
	
	* tests_flags.in: Remove.
	* testsuite/lib/libstdc++.exp: Remove.

Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.144
diff -c -p -r1.144 acinclude.m4
*** acinclude.m4	2001/04/26 04:29:15	1.144
--- acinclude.m4	2001/05/13 07:06:04
*************** LIB_AC_PROG_CXX
*** 117,126 ****
    AC_CHECK_TOOL(AS, as)
    AC_CHECK_TOOL(AR, ar)
    AC_CHECK_TOOL(RANLIB, ranlib, ranlib-not-found-in-path-error)
-   AC_CHECK_TOOL(glibcpp_expect, expect, expect-not-found-in-path-error)
-   AC_CHECK_TOOL(glibcpp_runtest, runtest, runtest-not-found-in-path-error)
-   AC_SUBST(glibcpp_expect)
-   AC_SUBST(glibcpp_runtest)
    AC_PROG_INSTALL
  
    AM_MAINTAINER_MODE
--- 117,122 ----
*************** AC_DEFUN(GLIBCPP_EXPORT_INSTALL_INFO, [
*** 1581,1586 ****
--- 1577,1588 ----
  glibcpp_toolexecdir=no
  glibcpp_toolexeclibdir=no
  
+ # Export build and source directories.
+ tmp_builddir=`pwd`
+ glibcpp_builddir=$tmp_builddir
+ glibcpp_srcdir=${srcdir}
+ glibcpp_prefixdir=${prefix}
+ 
  AC_MSG_CHECKING([for interface version number])
  libstdcxx_interface=$INTERFACE
  AC_MSG_RESULT($libstdcxx_interface)
*************** fi
*** 1643,1648 ****
--- 1645,1653 ----
  AC_MSG_CHECKING([for install location])
  AC_MSG_RESULT($gxx_include_dir)
  
+ AC_SUBST(glibcpp_builddir)
+ AC_SUBST(glibcpp_srcdir)
+ AC_SUBST(glibcpp_prefixdir)
  AC_SUBST(gxx_include_dir)
  AC_SUBST(glibcpp_toolexecdir)
  AC_SUBST(glibcpp_toolexeclibdir)
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.in,v
retrieving revision 1.60
diff -c -p -r1.60 configure.in
*** configure.in	2001/05/03 20:35:13	1.60
--- configure.in	2001/05/13 07:06:05
*************** fi
*** 281,294 ****
  # installed in the correct place. To work around this not being passed
  # down from config-ml.in -> top_srcdir/Makefile.am ->
  # top_srcdir/{src,libsupc++}/Makefile.am, manually append it here.
! AC_OUTPUT(tests_flags mkcheck Makefile src/Makefile libmath/Makefile libio/Makefile libsupc++/Makefile testsuite/Makefile,
  [if test -n "$CONFIG_FILES"; then
    ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
    grep '^MULTISUBDIR =' Makefile >> src/Makefile
    grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
  fi
- chmod +x tests_flags
  chmod +x mkcheck
  ],
  srcdir=${srcdir}
  host=${host}
--- 281,294 ----
  # installed in the correct place. To work around this not being passed
  # down from config-ml.in -> top_srcdir/Makefile.am ->
  # top_srcdir/{src,libsupc++}/Makefile.am, manually append it here.
! AC_OUTPUT(Makefile src/Makefile libmath/Makefile libio/Makefile libsupc++/Makefile testsuite/Makefile mkcheck testsuite_flags,
  [if test -n "$CONFIG_FILES"; then
    ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
    grep '^MULTISUBDIR =' Makefile >> src/Makefile
    grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
  fi
  chmod +x mkcheck
+ chmod +x testsuite_flags
  ],
  srcdir=${srcdir}
  host=${host}
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/Makefile.am,v
retrieving revision 1.21
diff -c -p -r1.21 Makefile.am
*** Makefile.am	2001/04/19 23:07:18	1.21
--- Makefile.am	2001/05/13 07:06:05
*************** AM_MAKEFLAGS = \
*** 121,126 ****
--- 121,127 ----
  	"PICFLAG=$(PICFLAG)" \
  	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
  	"SHELL=$(SHELL)" \
+ 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
  	"exec_prefix=$(exec_prefix)" \
  	"infodir=$(infodir)" \
  	"libdir=$(libdir)" \
Index: testsuite_flags.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite_flags.in,v
retrieving revision 1.1
diff -c -p -r1.1 testsuite_flags.in
*** testsuite_flags.in	2001/05/12 17:45:46	1.1
--- testsuite_flags.in	2001/05/13 07:06:05
***************
*** 12,22 ****
  print_usage() {
      cat <<EOF
  Usage: 
!     tests_flags --install-includes
! 		--build-includes
! 		--build-cxx
! 		--install-cxx
! 		--cxxflags
  EOF
  }
  
--- 12,22 ----
  print_usage() {
      cat <<EOF
  Usage: 
!     testsuite_flags --install-includes
! 		    --build-includes
! 		    --build-cxx
! 		    --install-cxx
! 		    --cxxflags
  EOF
  }
  
Index: testsuite/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/Makefile.am,v
retrieving revision 1.3
diff -c -p -r1.3 Makefile.am
*** Makefile.am	2001/04/11 18:52:31	1.3
--- Makefile.am	2001/05/13 07:06:05
***************
*** 23,34 ****
  
  AUTOMAKE_OPTIONS =  foreign dejagnu
  
! DEJATOOL = libstdc++
  
! EXPECT = @glibcpp_expect@
  
! RUNTEST = @glibcpp_runtest@
  
! 
! 
  
--- 23,37 ----
  
  AUTOMAKE_OPTIONS =  foreign dejagnu
  
! DEJATOOL = libstdc++-v3
  
! EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then \
!             echo @glibcpp_builddir@/../../expect/expect ; \
!           else echo expect ; fi`
  
! RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then \
! 	       echo @glibcpp_srcdir@/../dejagnu/runtest ; \
! 	    else echo runtest; fi`
  
! RUNTESTFLAGS =
  


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]