diff options
Diffstat (limited to 'libstdc++-v3/testsuite/Makefile.am')
-rw-r--r-- | libstdc++-v3/testsuite/Makefile.am | 42 |
1 files changed, 10 insertions, 32 deletions
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index bbe1fe5f45b..3a03189b7b8 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -21,28 +21,14 @@ ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## USA. -AUTOMAKE_OPTIONS = cygnus dejagnu +AUTOMAKE_OPTIONS = dejagnu -mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs - -DEJATOOL = libstdc++-v3 - -EXPECT = `if [ -f @glibcxx_builddir@/../../expect/expect ] ; then \ - echo @glibcxx_builddir@/../../expect/expect ; \ - else echo expect ; fi` - -RUNTEST = `if [ -f @glibcxx_srcdir@/../dejagnu/runtest ] ; then \ - echo @glibcxx_srcdir@/../dejagnu/runtest ; \ - else echo runtest; fi` +include $(top_srcdir)/fragment.am AM_MAKEFLAGS = -j1 AM_RUNTESTFLAGS = -RUNTESTFLAGS = -PWD_COMMAND = $${PWDCMD-pwd} ## CXX is actually a "C" compiler. These are real C++ programs. -glibcxx_srcdir=@glibcxx_srcdir@ -glibcxx_builddir=@glibcxx_builddir@ testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags CXX=`${testsuite_flags_script} --build-cxx` @@ -51,13 +37,6 @@ CXXLINK = \ $(LIBTOOL) --tag=CXX --mode=link $(CXX) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ -GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@ -LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ -TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ -INCLUDES = \ - -nostdinc++ \ - @GLIBCXX_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ - # Generated lists of files to run. All of these names are valid make # targets, if you wish to generate a list manually. lists_of_files = \ @@ -73,7 +52,7 @@ libv3test_a_SOURCES = testsuite_hooks.cc testsuite_allocator.cc if GLIBCXX_TEST_ABI noinst_PROGRAMS = abi_check else -noinst_PROGRAMS = +noinst_PROGRAMS = endif abi_check_SOURCES = abi_check.cc @@ -90,9 +69,8 @@ endif # This is automatically run after the generated check-DEJAGNU rule. check-local: check-abi -baseline_dir = @baseline_dir@ baseline_file = ${baseline_dir}/baseline_symbols.txt -extract_symvers = @glibcxx_srcdir@/scripts/extract_symvers +extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers current_symbols.txt: ${extract_symvers} ../src/.libs/libstdc++.so -@(${extract_symvers} ../src/.libs/libstdc++.so current_symbols.txt) @@ -105,7 +83,7 @@ baseline_symbols: exit 1; \ fi; true) -new-abi-baseline: +new-abi-baseline: -@$(mkinstalldirs) ${baseline_dir} -@(output=${baseline_file}; \ if test -f $${output}; then \ @@ -120,11 +98,11 @@ if GLIBCXX_TEST_ABI # 'check-abi' to test for changes against that file. check-abi: abi_check baseline_symbols current_symbols.txt -@(./abi_check --check ./current_symbols.txt ${baseline_file} \ - 2>&1 | tee libstdc++-v3-abi.sum) + 2>&1 | tee libstdc++-abi.sum) -check-abi-verbose: abi_check baseline_symbols current_symbols.txt +check-abi-verbose: abi_check baseline_symbols current_symbols.txt -@(./abi_check --check-verbose ./current_symbols.txt ${baseline_file} \ - 2>&1 | tee libstdc++-v3-abi.sum) + 2>&1 | tee libstdc++-abi.sum) else check-abi: @@ -147,7 +125,7 @@ check-script-install: ${survey_script} ${survey_script} 0) -# Runs the testsuite/performance tests. +# Runs the testsuite/performance tests. # Some of these tests create large (~75MB) files, allocate huge # ammounts of memory, or otherwise tie up machine resources. Thus, # running this is off by default. @@ -168,4 +146,4 @@ check-script check-script-install check-performance # By adding these files here, automake will remove them for 'make clean' CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp* ostream_* *.log *.sum \ - testsuite_* site.exp abi_check baseline_symbols + testsuite_* site.exp abi_check baseline_symbols |