diff options
Diffstat (limited to 'libstdc++-v3/testsuite')
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.am | 13 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.in | 17 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/libstdc++.tests/tests.exp | 40 |
4 files changed, 22 insertions, 52 deletions
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index 99ff168ca67..6aecb39485a 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -23,12 +23,15 @@ AUTOMAKE_OPTIONS = foreign dejagnu -DEJATOOL = libstdc++ - -EXPECT = @glibcpp_expect@ - -RUNTEST = @glibcpp_runtest@ +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 = diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 5b618a53b39..ca5e1d50691 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -107,8 +107,9 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ glibcpp_CXX = @glibcpp_CXX@ glibcpp_basedir = @glibcpp_basedir@ -glibcpp_expect = @glibcpp_expect@ -glibcpp_runtest = @glibcpp_runtest@ +glibcpp_builddir = @glibcpp_builddir@ +glibcpp_prefixdir = @glibcpp_prefixdir@ +glibcpp_srcdir = @glibcpp_srcdir@ glibcpp_toolexecdir = @glibcpp_toolexecdir@ glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@ gxx_include_dir = @gxx_include_dir@ @@ -118,11 +119,15 @@ toplevel_srcdir = @toplevel_srcdir@ AUTOMAKE_OPTIONS = foreign dejagnu -DEJATOOL = libstdc++ +DEJATOOL = libstdc++-v3 -EXPECT = @glibcpp_expect@ +EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then echo @glibcpp_builddir@/../../expect/expect ; else echo expect ; fi` -RUNTEST = @glibcpp_runtest@ + +RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then echo @glibcpp_srcdir@/../dejagnu/runtest ; else echo runtest; fi` + + +RUNTESTFLAGS = mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -162,8 +167,6 @@ distdir: $(DISTFILES) fi; \ done -RUNTESTFLAGS = - RUNTESTDEFAULTFLAGS = --tool $(DEJATOOL) --srcdir $$srcdir check-DEJAGNU: site.exp diff --git a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp index 8f2f83266aa..21729c90d87 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp @@ -108,6 +108,10 @@ proc libstdc++-v3_target_compile { source dest type options } { set cxx_final [concat $cxx_final $cxxlibglossflags] set cxx_final [concat $cxx_final $cxxflags] set cxx_final [concat $cxx_final $includes] + + # XXX + set cxx_final [concat $cxx_final -static] + lappend options "compiler=$cxx_final"; return [target_compile $source $dest $type $options] diff --git a/libstdc++-v3/testsuite/libstdc++.tests/tests.exp b/libstdc++-v3/testsuite/libstdc++.tests/tests.exp deleted file mode 100644 index e730eb7c632..00000000000 --- a/libstdc++-v3/testsuite/libstdc++.tests/tests.exp +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (C) 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# Please email any bugs, comments, and/or additions to this file to: -# libstdc++@gcc.gnu.org -# -# This file is contributed by Gabriel Dos Reis <gdr@codesourcery.com> - -load_lib libstdc++.exp - -## Initialize the framework. -libstdc++-dg-init - -## Set ulimits. This should normally be handled on test-by-test -## basis through @xxx@-keywords. -## The following limit is expressed in kilobytes. For history, Have a -## look at http://gcc.gnu.org/ml/libstdc++/2000-10/msg00029.html -set maximum-memory-usage 16384 -set shell-ulimit-command ulimit -remote_exec host ${shell-ulimit-command} "-d ${maximum-memory-usage}" -remote_exec host ${shell-ulimit-command} "-v ${maximum-memory-usage}" - -## Now, do the work directory by directory -libstdc++-runtest [glob -nocomplain $srcdir/*] -dg-finish - - |