X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Ftestsuite%2FMakefile.am;h=14ce3b7bf4c17f19de4ebeb7fc64079a48b1c6f4;hb=a0d20ccbd97fde9c2af1f7345e3eb1313dea570f;hp=436f0bbad79becc4c0d5e79e697596a36e2066e7;hpb=4497787e5dcf638ea0316a7719a0683cd34a56a6;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index 436f0bbad79..14ce3b7bf4c 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -1,6 +1,6 @@ ## Makefile for the testsuite subdirectory of the GNU C++ Standard library. ## -## Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +## Copyright (C) 2001, 2002, 2003, 2005, 2007 Free Software Foundation, Inc. ## ## This file is part of the libstdc++ version 3 distribution. ## Process this file with automake to produce Makefile.in. @@ -18,68 +18,15 @@ ## You should have received a copy of the GNU General Public License along ## with this library; see the file COPYING. If not, write to the Free -## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +## Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ## USA. -AUTOMAKE_OPTIONS = dejagnu nostdinc +AUTOMAKE_OPTIONS = nostdinc +RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +EXPECT = expect include $(top_srcdir)/fragment.am -AM_MAKEFLAGS = -j1 -AM_RUNTESTFLAGS = - -## CXX is actually a "C" compiler. These are real C++ programs. -testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags -CXX = $(shell ${testsuite_flags_script} --build-cxx) -GLIBCXX_INCLUDES = $(shell ${testsuite_flags_script} --build-includes) -AM_CXXFLAGS = $(shell ${testsuite_flags_script} --cxxflags) - -GLIBGCC_DIR=`$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'` -GLIBCXX_DIR=${glibcxx_builddir}/src/.libs - -CXXLINK = \ - $(LIBTOOL) --tag=CXX --mode=link $(CXX) \ - -R $(GLIBGCC_DIR) -R $(GLIBCXX_DIR) \ - $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -lv3test -L. -o $@ - -## Build support library. -noinst_LIBRARIES = libv3test.a -libv3test_a_SOURCES = \ - testsuite_abi.cc \ - testsuite_allocator.cc \ - testsuite_hooks.cc - -## Build support utilities. -if GLIBCXX_TEST_ABI -noinst_PROGRAMS = abi_check -else -noinst_PROGRAMS = -endif -abi_check_SOURCES = abi_check.cc -abi_check_DEPENDENCIES = libv3test.a - -all-local: stamp_wchar stamp_thread testsuite_files - -# Enable wchar_t tests if capable. -if GLIBCXX_TEST_WCHAR_T -IGNORE_WCHAR_T = -stamp_wchar: - touch testsuite_wchar_t -else -IGNORE_WCHAR_T = *wchar_t* -stamp_wchar: -endif - -# Enable thread tests if capable. -if GLIBCXX_TEST_THREAD -IGNORE_THREAD = -stamp_thread: - touch testsuite_thread -else -IGNORE_THREAD = *thread* -stamp_thread: -endif - # 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 = \ @@ -87,7 +34,10 @@ lists_of_files = \ testsuite_files_interactive \ testsuite_files_performance -TESTS_TO_IGNORE = $(IGNORE_WCHAR_T) $(IGNORE_THREAD) +# This rule generates all of the testsuite_files* lists at once. +${lists_of_files}: + ${glibcxx_srcdir}/scripts/create_testsuite_files \ + ${glibcxx_srcdir}/testsuite `${PWD_COMMAND}` # We need more things in site.exp, but automake completely controls the # creation of that file; there's no way to append to it without messing up @@ -108,8 +58,7 @@ site.exp: Makefile @echo 'set target_triplet $(target_triplet)' >>site.tmp @echo 'set target_triplet $(target_triplet)' >>site.tmp @echo 'set libiconv "$(LIBICONV)"' >>site.tmp - @echo 'set tests_to_ignore [list $(TESTS_TO_IGNORE)]' >> site.tmp - @echo 'set cxxflags { $(AM_CXXFLAGS) }' >> site.tmp + @echo 'set baseline_file "$(baseline_file)"' >> site.tmp @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp @test ! -f site.exp || \ sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp @@ -117,15 +66,10 @@ site.exp: Makefile @test ! -f site.exp || mv site.exp site.bak @mv site.tmp site.exp -# This is automatically run after the generated check-DEJAGNU rule. -check-local: check-abi baseline_file = ${baseline_dir}/baseline_symbols.txt 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) - baseline_symbols: -@(output=${baseline_file}; \ if test ! -f $${output}; then \ @@ -144,65 +88,141 @@ new-abi-baseline: fi; \ ${extract_symvers} ../src/.libs/libstdc++.so $${output}) -if GLIBCXX_TEST_ABI -# Use 'new-abi-baseline' to create an initial symbol file. Then run -# '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++-abi.sum - -@cp libstdc++-abi.sum libstdc++-abi.log - -check-abi-verbose: abi_check baseline_symbols current_symbols.txt - -@./abi_check --check-verbose ./current_symbols.txt ${baseline_file} \ - 2>&1 | tee libstdc++-abi.sum - -@cp libstdc++-abi.sum libstdc++-abi.log - -else -check-abi: -check-abi-verbose: -endif - - -# These two special 'check-script' rules use the bash script -# 'check_survey' to do testing. This script is not as portable as the -# dejagnu test harness, and is thus off by default. It does produce -# interesting output however, including various performance analysis -# items like compile time, execution time, and binary size. -survey_script = ${glibcxx_builddir}/scripts/check_survey -check-script: ${survey_script} - -@(chmod + ${survey_script}; \ - ${survey_script} 0) - -check-script-install: ${survey_script} - -@(chmod + ${survey_script}; \ - ${survey_script} 0) +%/site.exp: site.exp + -test -d $* || mkdir $* + @srcdir=`cd $(srcdir); ${PWD_COMMAND}`; + objdir=`${PWD_COMMAND}`/$*; \ + sed -e "s|^set srcdir .*$$|set srcdir $$srcdir|" \ + -e "s|^set objdir .*$$|set objdir $$objdir|" \ + site.exp > $*/site.exp.tmp + @-rm -f $*/site.bak + @test ! -f $*/site.exp || mv $*/site.exp $*/site.bak + @mv $*/site.exp.tmp $*/site.exp + +check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3) +$(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp + +# Run the testsuite in normal mode. +check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp + if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \ + && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \ + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNUnormal0 check-DEJAGNUnormal1 \ + check-DEJAGNUnormal2 check-DEJAGNUnormal3; \ + for idx in 0 1 2 3; do \ + mv -f normal$$idx/libstdc++.sum normal$$idx/libstdc++.sum.sep; \ + mv -f normal$$idx/libstdc++.log normal$$idx/libstdc++.log.sep; \ + done; \ + mv -f libstdc++.sum libstdc++.sum.sep; \ + mv -f libstdc++.log libstdc++.log.sep; \ + $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \ + libstdc++.sum.sep normal0/libstdc++.sum.sep \ + normal1/libstdc++.sum.sep normal2/libstdc++.sum.sep \ + normal3/libstdc++.sum.sep > libstdc++.sum; \ + $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \ + libstdc++.log.sep normal0/libstdc++.log.sep \ + normal1/libstdc++.log.sep normal2/libstdc++.log.sep \ + normal3/libstdc++.log.sep > libstdc++.log; \ + exit 0; \ + fi; \ + srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ + EXPECT=$(EXPECT); export EXPECT; \ + runtest=$(RUNTEST); \ + if [ -z "$$runtest" ]; then runtest=runtest; fi; \ + tool=libstdc++; \ + dirs=; \ + case "$*" in \ + normal0) \ + if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ + $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \ + $(RUNTESTFLAGS) abi.exp; \ + else echo "WARNING: could not find \`runtest'" 1>&2; :;\ + fi; \ + dirs="`cd $$srcdir; echo [013-9][0-9]_*/* [abep]*/*`";; \ + normal1) \ + dirs="`cd $$srcdir; echo 2[0-2]_*/*`";; \ + normal2) \ + dirs="`cd $$srcdir; echo 2[4-9]_*/*`";; \ + normal3) \ + dirs="`cd $$srcdir; echo 23_*/* t*/*`";; \ + esac; \ + if [ -n "$*" ]; then cd "$*"; fi; \ + if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ + if [ -n "$$dirs" ]; then \ + $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \ + $(RUNTESTFLAGS) \ + "conformance.exp=`echo $$dirs | sed 's/ /* /g;s/$$/*/'`"; \ + else \ + $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \ + $(RUNTESTFLAGS); \ + fi; \ + else echo "WARNING: could not find \`runtest'" 1>&2; :;\ + fi +check-am: + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU +.PHONY: check-DEJAGNU -# 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. -performance_script=${glibcxx_srcdir}/scripts/check_performance -check-performance: testsuite_files_performance ${performance_script} - -@(chmod + ${performance_script}; \ - ${performance_script} ${glibcxx_srcdir} ${glibcxx_builddir}) +# Use 'new-abi-baseline' to create an initial symbol file. Then run +# 'check-abi' to test for changes against that file. +check-abi: site.exp baseline_symbols + -@runtest --tool libstdc++ abi.exp -# Runs the testsuite, but in compile only mode, and times it. +# Runs the testsuite, but in compile only mode. +# Can be used to test sources with non-GNU FE's at various warning +# levels and for checking compile time across releases. # See script. compile_script=${glibcxx_srcdir}/scripts/check_compile check-compile: testsuite_files ${compile_script} -@(chmod + ${compile_script}; \ ${compile_script} ${glibcxx_srcdir} ${glibcxx_builddir}) -# This rule generates all of the testsuite_files* lists at once. -${lists_of_files}: - ${glibcxx_srcdir}/scripts/create_testsuite_files \ - ${glibcxx_srcdir}/testsuite `${PWD_COMMAND}` - -.PHONY: baseline_symbols new-abi-baseline check-abi check-abi-verbose \ -check-script check-script-install check-performance +# 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. +# XXX Need to add dependency on libtestc++.a +check_performance_script=${glibcxx_srcdir}/scripts/check_performance +check-performance: testsuite_files_performance ${performance_script} + -@(chmod + ${check_performance_script}; \ + ${check_performance_script} ${glibcxx_srcdir} ${glibcxx_builddir}) + + +# Runs the testsuite in parallel mode. +libgomp_dir=${glibcxx_builddir}/../libgomp +libgomp_flags=-B${glibcxx_builddir}/../libgomp \ + -I${glibcxx_builddir}/../libgomp \ + -L${glibcxx_builddir}/../libgomp/.libs -lgomp + +atomic_flags=$(ATOMIC_FLAGS) +parallel_flags="unix/-D_GLIBCXX_PARALLEL/-fopenmp" + +check-parallel: site.exp + -@(if test ! -d $${libgomp_dir}; then \ + echo "Testing parallel mode failed as libgomp not present."; \ + exit 1; \ + fi; \ + outputdir=parallel; export outputdir; \ + if test ! -d $${outputdir}; then \ + mkdir $${outputdir}; \ + fi; \ + srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ + EXPECT=$(EXPECT); export EXPECT; \ + $(MAKE) CXXFLAGS="$(atomic_flags) $(libgomp_flags)" RUNTESTFLAGS="$(RUNTESTFLAGS) conformance.exp --outdir $${outputdir} --objdir $${outputdir} --target_board=$(parallel_flags)" check-DEJAGNU; ) + +check-performance-parallel: testsuite_files_performance ${performance_script} + -@(chmod + ${check_performance_script}; \ + CXXFLAGS="-D_GLIBCXX_PARALLEL -fopenmp $(atomic_flags) $(libgomp_flags)"; export CXXFLAGS; \ + ${check_performance_script} ${glibcxx_srcdir} ${glibcxx_builddir}) + +.PHONY: baseline_symbols new-abi-baseline \ + check-abi check-compile check-performance check-parallel # 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 *TEST* + testsuite_* site.exp abi_check baseline_symbols *TEST* *.dat \ + *.s *.o *.cc *.a *.so *.xml + +# To remove directories. +clean-local: + rm -rf parallel