OSDN Git Service

Revert delta 190174
[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / testsuite / Makefile.am
index c81db8c..0cf8de5 100644 (file)
@@ -1,7 +1,7 @@
 ## Makefile for the testsuite subdirectory of the GNU C++ Standard library.
 ##
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-## Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+## 2011, 2012 Free Software Foundation, Inc.
 ##
 ## This file is part of the libstdc++ version 3 distribution.
 ## Process this file with automake to produce Makefile.in.
@@ -59,6 +59,8 @@ site.exp: Makefile
        @echo 'set target_triplet $(target_triplet)' >>site.tmp
        @echo 'set libiconv "$(LIBICONV)"' >>site.tmp
        @echo 'set baseline_dir "$(baseline_dir)"' >> site.tmp
+       @echo 'set baseline_subdir_switch "$(baseline_subdir_switch)"' >> site.tmp
+       @echo 'set TEST_GCC_EXEC_PREFIX "$(libdir)/gcc/"' >> 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
@@ -67,10 +69,12 @@ site.exp: Makefile
        @mv site.tmp site.exp
 
 
-extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers
+extract_symvers = $(glibcxx_builddir)/scripts/extract_symvers
+
+baseline_subdir := $(shell $(CXX) $(baseline_subdir_switch))
 
 baseline_symbols:
-       -@(output=${baseline_dir}/baseline_symbols.txt; \
+       -@(output=${baseline_dir}/${baseline_subdir}/baseline_symbols.txt; \
          if test ! -f $${output}; then \
            echo "Baseline file doesn't exist."; \
            echo "Try 'make new-abi-baseline' to create it."; \
@@ -78,8 +82,8 @@ baseline_symbols:
          fi; true)
 
 new-abi-baseline:
-       -@$(mkinstalldirs) ${baseline_dir}
-       -@(output=${baseline_dir}/baseline_symbols.txt; \
+       -@$(mkinstalldirs) ${baseline_dir}/${baseline_subdir}
+       -@(output=${baseline_dir}/${baseline_subdir}/baseline_symbols.txt; \
          if test -f $${output}; then \
            output=$${output}.new; \
            t=`echo $${output} | sed 's=.*config/abi/=='`; \
@@ -98,7 +102,7 @@ new-abi-baseline:
        @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 = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3 4 5 6 7 8 9)
 $(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp
 
 # Run the testsuite in normal mode.
@@ -107,22 +111,17 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
        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; \
@@ -135,16 +134,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 \
@@ -245,8 +256,8 @@ check-profile: site.exp
 # 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* *.dat \
-            *.s *.o *.cc *.a *.so *.xml 
+            *.ii *.s *.o *.cc *.x *.a *.so *.xml *.raw *.out *.gdb
 
 # To remove directories.
 clean-local:
-       rm -rf debug parallel profile
+       rm -rf de fr debug parallel profile binaries normal*