Revert delta 190174

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / testsuite / Makefile.in

diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index f489462..bb077d1 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -290,7 +290,6 @@ 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)
-check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3)
 
 # Runs the testsuite, but in compile only mode.
 # Can be used to test sources with non-GNU FE's at various warning
@@ -406,7 +405,7 @@ clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -466,11 +465,15 @@ ps-am:
 
 uninstall-am:
 
+.MAKE: install-am install-strip
+
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
        clean-local distclean distclean-generic distclean-libtool dvi \
        dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-exec install-exec-am \
-       install-info install-info-am install-man install-strip \
+       install-data install-data-am install-dvi install-dvi-am \
+       install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-pdf \
+       install-pdf-am install-ps install-ps-am install-strip \
        installcheck installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic \
        mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
@@ -542,24 +545,21 @@ $(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; \
+       RANLIB="$(RANLIB)"; export RANLIB; \
        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 \
+         $(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_normal_targets); \
+         for idx in 0 1 2 3 4 5 6 7 8 9; 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; \
+           libstdc++.sum.sep normal[0-9]/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; \
+           libstdc++.log.sep normal[0-9]/libstdc++.log.sep > libstdc++.log; \
          exit 0; \
        fi; \
        srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
@@ -572,16 +572,28 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
          normal0) \
            if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
              $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
-                       $(RUNTESTFLAGS) abi.exp; \
+                       $(RUNTESTFLAGS) abi.exp prettyprinters.exp; \
            else echo "WARNING: could not find \`runtest'" 1>&2; :;\
            fi; \
-           dirs="`cd $$srcdir; echo [013-9][0-9]_*/* [abep]*/*`";; \
+           dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \
          normal1) \
-           dirs="`cd $$srcdir; echo 2[0-2]_*/*`";; \
+           dirs="`cd $$srcdir; echo [ab]* de* [ep]*/*`";; \
          normal2) \
-           dirs="`cd $$srcdir; echo 2[4-9]_*/*`";; \
+           dirs="`cd $$srcdir; echo 2[01]_*/*`";; \
          normal3) \
-           dirs="`cd $$srcdir; echo 23_*/* t*/*`";; \
+           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 2[68]_*/*`";; \
+         normal8) \
+           dirs="`cd $$srcdir; echo 27_*/*`";; \
+         normal9) \
+           dirs="`cd $$srcdir; echo t*/*`";; \
        esac; \
        if [ -n "$*" ]; then cd "$*"; fi; \
        if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \