diff options
Diffstat (limited to 'libstdc++-v3/testsuite/Makefile.in')
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.in | 87 |
1 files changed, 36 insertions, 51 deletions
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index de55011ad50..e0e7114147d 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -238,6 +238,7 @@ glibcxx_POFILES = @glibcxx_POFILES@ glibcxx_builddir = @glibcxx_builddir@ glibcxx_compiler_pic_flag = @glibcxx_compiler_pic_flag@ glibcxx_compiler_shared_flag = @glibcxx_compiler_shared_flag@ +glibcxx_cxx98_abi = @glibcxx_cxx98_abi@ glibcxx_localedir = @glibcxx_localedir@ glibcxx_lt_pic_flag = @glibcxx_lt_pic_flag@ glibcxx_prefixdir = @glibcxx_prefixdir@ @@ -323,7 +324,16 @@ lists_of_files = \ extract_symvers = $(glibcxx_builddir)/scripts/extract_symvers baseline_subdir := $(shell $(CXX) $(baseline_subdir_switch)) -check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3 4 5 6 7 8 9 10) +check_p_numbers0 := 1 2 3 4 5 6 7 8 9 +check_p_numbers1 := 0 $(check_p_numbers0) +check_p_numbers2 := $(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers1))) +check_p_numbers3 := $(addprefix 0,$(check_p_numbers1)) $(check_p_numbers2) +check_p_numbers4 := $(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers3))) +check_p_numbers5 := $(addprefix 0,$(check_p_numbers3)) $(check_p_numbers4) +check_p_numbers6 := $(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers5))) +check_p_numbers := $(check_p_numbers0) $(check_p_numbers2) $(check_p_numbers4) $(check_p_numbers6) +check_p_subdirs = $(wordlist 1,$(if $(GCC_TEST_PARALLEL_SLOTS),$(GCC_TEST_PARALLEL_SLOTS),128),$(check_p_numbers)) +check_DEJAGNU_normal_targets = $(addprefix check-DEJAGNUnormal,$(check_p_subdirs)) # Runs the testsuite, but in compile only mode. # Can be used to test sources with non-GNU FE's at various warning @@ -572,9 +582,9 @@ new-abi-baseline: ${extract_symvers} ../src/.libs/libstdc++.so $${output}) %/site.exp: site.exp - -test -d $* || mkdir $* + -@test -d $* || mkdir $* @srcdir=`cd $(srcdir); ${PWD_COMMAND}`; - objdir=`${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 @@ -585,21 +595,23 @@ $(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 - AR="$(AR)"; export AR; \ + $(if $*,@)AR="$(AR)"; export AR; \ RANLIB="$(RANLIB)"; export RANLIB; \ - if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \ - && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \ + if [ -z "$*" ] && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \ + rm -rf normal-parallel || true; \ + mkdir normal-parallel; \ $(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_normal_targets); \ - for idx in 0 1 2 3 4 5 6 7 8 9 10; do \ - mv -f normal$$idx/libstdc++.sum normal$$idx/libstdc++.sum.sep; \ - mv -f normal$$idx/libstdc++.log normal$$idx/libstdc++.log.sep; \ + rm -rf normal-parallel || true; \ + for idx in $(check_p_subdirs); do \ + if [ -d normal$$idx ]; then \ + mv -f normal$$idx/libstdc++.sum normal$$idx/libstdc++.sum.sep; \ + mv -f normal$$idx/libstdc++.log normal$$idx/libstdc++.log.sep; \ + fi; \ 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 normal[0-9]*/libstdc++.sum.sep > libstdc++.sum; \ + normal[0-9]*/libstdc++.sum.sep > libstdc++.sum; \ $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \ - libstdc++.log.sep normal[0-9]*/libstdc++.log.sep > libstdc++.log; \ + normal[0-9]*/libstdc++.log.sep > libstdc++.log; \ exit 0; \ fi; \ srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ @@ -607,47 +619,20 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp 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 prettyprinters.exp; \ - else echo "WARNING: could not find \`runtest'" 1>&2; :;\ - fi; \ - dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \ - normal1) \ - dirs="`cd $$srcdir; echo [ab]* de* [ep]*/*`";; \ - normal2) \ - dirs="`cd $$srcdir; echo 2[01]_*/*`";; \ - normal3) \ - dirs="`cd $$srcdir; echo 22_*/*`";; \ - normal4) \ - dirs="`cd $$srcdir; echo 23_*/[a-km-tw-z]*`";; \ - normal5) \ - dirs="`cd $$srcdir; echo 23_*/[luv]*`";; \ - normal6) \ - dirs="`cd $$srcdir; echo 2[459]_*/*`";; \ - normal7) \ - dirs="`cd $$srcdir; echo 26_*/* 28_*/[c-z]*`";; \ - normal8) \ - dirs="`cd $$srcdir; echo 27_*/*`";; \ - normal9) \ - dirs="`cd $$srcdir; echo 28_*/[ab]*`";; \ - normal10) \ - dirs="`cd $$srcdir; echo t*/*`";; \ - esac; \ - if [ -n "$*" ]; then cd "$*"; fi; \ + if [ -n "$*" ]; then \ + if [ -f normal-parallel/finished ]; then rm -rf "$*"; exit 0; fi; \ + GCC_RUNTEST_PARALLELIZE_DIR=`${PWD_COMMAND}`/normal-parallel; \ + export GCC_RUNTEST_PARALLELIZE_DIR; \ + 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) \ + $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \ $(RUNTESTFLAGS); \ + if [ -n "$*" ]; then \ + touch $$GCC_RUNTEST_PARALLELIZE_DIR/finished; \ fi; \ - else echo "WARNING: could not find \`runtest'" 1>&2; :;\ + else \ + echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi check-am: |