X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libstdc%2B%2B-v3%2Ftestsuite%2FMakefile.in;h=3c4f39ec32dcdb4c28e20ae1601e599d921c1f65;hp=86444c291697540bc9929882b9abe37aa2c8687c;hb=a912f091fa1956f16d96ca4cd73a8d4c5dcd8484;hpb=e95f17723fb9794b967219e107500c1db6011453 diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 86444c29169..3c4f39ec32d 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DBLATEX = @DBLATEX@ -DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ DOT = @DOT@ @@ -135,7 +134,6 @@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -163,7 +161,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ -RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ @@ -178,6 +175,7 @@ WARN_FLAGS = @WARN_FLAGS@ WERROR = @WERROR@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@ +XSL_STYLE_DIR = @XSL_STYLE_DIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -189,6 +187,7 @@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ baseline_dir = @baseline_dir@ +baseline_subdir_switch = @baseline_subdir_switch@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -208,10 +207,12 @@ glibcxx_MOFILES = @glibcxx_MOFILES@ glibcxx_PCHFLAGS = @glibcxx_PCHFLAGS@ 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_localedir = @glibcxx_localedir@ +glibcxx_lt_pic_flag = @glibcxx_lt_pic_flag@ glibcxx_prefixdir = @glibcxx_prefixdir@ glibcxx_srcdir = @glibcxx_srcdir@ -glibcxx_thread_h = @glibcxx_thread_h@ glibcxx_toolexecdir = @glibcxx_toolexecdir@ glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@ gxx_include_dir = @gxx_include_dir@ @@ -239,6 +240,7 @@ port_specific_symbol_files = @port_specific_symbol_files@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +python_mod_dir = @python_mod_dir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -251,6 +253,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +toplevel_builddir = @toplevel_builddir@ toplevel_srcdir = @toplevel_srcdir@ AUTOMAKE_OPTIONS = nostdinc RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir @@ -264,14 +267,16 @@ PWD_COMMAND = $${PWDCMD-pwd} STAMP = echo timestamp > toolexecdir = $(glibcxx_toolexecdir) toolexeclibdir = $(glibcxx_toolexeclibdir) +@ENABLE_WERROR_FALSE@WERROR_FLAG = +@ENABLE_WERROR_TRUE@WERROR_FLAG = $(WERROR) # These bits are all figured out from configure. Look in acinclude.m4 # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS. CONFIG_CXXFLAGS = \ - $(SECTION_FLAGS) $(EXTRA_CXX_FLAGS) + $(SECTION_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ WARN_CXXFLAGS = \ - $(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once + $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once # -I/-D flags to pass when compiling. @@ -285,8 +290,8 @@ lists_of_files = \ testsuite_files_performance extract_symvers = $(glibcxx_builddir)/scripts/extract_symvers -baseline_subdir := $(shell $(CXX) --print-multi-dir) -check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3) +baseline_subdir := $(shell $(CXX) $(baseline_subdir_switch)) +check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3 4 5 6 7 8 9) # Runs the testsuite, but in compile only mode. # Can be used to test sources with non-GNU FE's at various warning @@ -319,7 +324,7 @@ profile_flags = "unix/-D_GLIBCXX_PROFILE" # 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 all: all-am @@ -501,6 +506,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 @@ -544,22 +551,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; \ @@ -572,16 +574,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]_*/* [ab]* de* [ep]*/*`";; \ + 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 \ @@ -652,7 +666,7 @@ check-profile: site.exp # To remove directories. clean-local: - rm -rf debug parallel profile + rm -rf de fr debug parallel profile binaries normal* # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.