X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Ftestsuite%2FMakefile.in;h=77ac3c2ad1c1eb7662156af1a184fe301364b32a;hb=f8b17f0f7b126b271d6067647ca6046c4f678c4c;hp=4201ab9256de539fc991c2c279a15ae3a047825d;hpb=03ac0bd7feb0e621d9762ad95826a74da59597d8;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 4201ab9256d..77ac3c2ad1c 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -14,8 +14,7 @@ @SET_MAKE@ - -SOURCES = $(libv3test_a_SOURCES) $(abi_check_SOURCES) +SOURCES = $(libv3test_a_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -42,13 +41,11 @@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/fragment.am -@GLIBCXX_TEST_ABI_TRUE@noinst_PROGRAMS = abi_check$(EXEEXT) subdir = testsuite ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/linkage.m4 \ - $(top_srcdir)/../config/no-executables.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \ + $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -61,10 +58,6 @@ libv3test_a_LIBADD = am_libv3test_a_OBJECTS = testsuite_abi.$(OBJEXT) \ testsuite_allocator.$(OBJEXT) testsuite_hooks.$(OBJEXT) libv3test_a_OBJECTS = $(am_libv3test_a_OBJECTS) -PROGRAMS = $(noinst_PROGRAMS) -am_abi_check_OBJECTS = abi_check.$(OBJEXT) -abi_check_OBJECTS = $(am_abi_check_OBJECTS) -abi_check_LDADD = $(LDADD) DEFAULT_INCLUDES = depcomp = am__depfiles_maybe = @@ -74,8 +67,8 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -SOURCES = $(libv3test_a_SOURCES) $(abi_check_SOURCES) -DIST_SOURCES = $(libv3test_a_SOURCES) $(abi_check_SOURCES) +SOURCES = $(libv3test_a_SOURCES) +DIST_SOURCES = $(libv3test_a_SOURCES) ETAGS = etags CTAGS = ctags DEJATOOL = $(PACKAGE) @@ -115,7 +108,7 @@ CPPFLAGS = @CPPFLAGS@ CSTDIO_H = @CSTDIO_H@ CTIME_CC = @CTIME_CC@ CTIME_H = @CTIME_H@ -CXX = $(shell ${testsuite_flags_script} --build-cxx) +CXX = $(shell ${SHELL} ${testsuite_flags_script} --build-cxx) CXXCPP = @CXXCPP@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -142,7 +135,9 @@ GLIBCXX_C_HEADERS_C_STD_TRUE = @GLIBCXX_C_HEADERS_C_STD_TRUE@ GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@ GLIBCXX_HOSTED_FALSE = @GLIBCXX_HOSTED_FALSE@ GLIBCXX_HOSTED_TRUE = @GLIBCXX_HOSTED_TRUE@ -GLIBCXX_INCLUDES = $(shell ${testsuite_flags_script} --build-includes) +GLIBCXX_INCLUDES = $(shell ${SHELL} ${testsuite_flags_script} \ + --build-includes) + GLIBCXX_TEST_ABI_FALSE = @GLIBCXX_TEST_ABI_FALSE@ GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@ GLIBCXX_TEST_THREAD_FALSE = @GLIBCXX_TEST_THREAD_FALSE@ @@ -249,6 +244,9 @@ target_os = @target_os@ target_vendor = @target_vendor@ toplevel_srcdir = @toplevel_srcdir@ AUTOMAKE_OPTIONS = dejagnu nostdinc + +# May be used by various substitution variables. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) MAINT_CHARSET = latin1 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs PWD_COMMAND = $${PWDCMD-pwd} @@ -270,7 +268,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) AM_MAKEFLAGS = -j1 AM_RUNTESTFLAGS = testsuite_flags_script = ${glibcxx_builddir}/scripts/testsuite_flags -AM_CXXFLAGS = $(shell ${testsuite_flags_script} --cxxflags) +AM_CXXFLAGS = $(shell ${SHELL} ${testsuite_flags_script} --cxxflags) GLIBGCC_DIR = `$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'` GLIBCXX_DIR = ${glibcxx_builddir}/src/.libs CXXLINK = \ @@ -284,8 +282,6 @@ libv3test_a_SOURCES = \ testsuite_allocator.cc \ testsuite_hooks.cc -abi_check_SOURCES = abi_check.cc -abi_check_DEPENDENCIES = libv3test.a # Generated lists of files to run. All of these names are valid make # targets, if you wish to generate a list manually. @@ -359,16 +355,6 @@ libv3test.a: $(libv3test_a_OBJECTS) $(libv3test_a_DEPENDENCIES) $(libv3test_a_AR) libv3test.a $(libv3test_a_OBJECTS) $(libv3test_a_LIBADD) $(RANLIB) libv3test.a -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -abi_check$(EXEEXT): $(abi_check_OBJECTS) $(abi_check_DEPENDENCIES) - @rm -f abi_check$(EXEEXT) - $(CXXLINK) $(abi_check_LDFLAGS) $(abi_check_OBJECTS) $(abi_check_LDADD) $(LIBS) - mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -488,9 +474,9 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check-local + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check: check-am -all-am: Makefile $(LIBRARIES) $(PROGRAMS) all-local +all-am: Makefile $(LIBRARIES) all-local installdirs: install: install-am install-exec: install-exec-am @@ -520,7 +506,7 @@ maintainer-clean-generic: clean: clean-am clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ - clean-noinstPROGRAMS mostlyclean-am + mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -567,20 +553,19 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: CTAGS GTAGS all all-am all-local check check-DEJAGNU check-am \ - check-local clean clean-generic clean-libtool \ - clean-noinstLIBRARIES clean-noinstPROGRAMS ctags distclean \ - distclean-DEJAGNU distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir 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 installcheck \ - installcheck-am installdirs maintainer-clean \ + clean clean-generic clean-libtool clean-noinstLIBRARIES ctags \ + distclean distclean-DEJAGNU distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir 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 \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-info-am -all-local: stamp_wchar stamp_thread testsuite_files +all-local: stamp_wchar stamp_thread # Enable wchar_t tests if capable. @GLIBCXX_TEST_WCHAR_T_TRUE@stamp_wchar: @@ -611,6 +596,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 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 @@ -618,12 +604,6 @@ 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 - -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 \ @@ -644,18 +624,9 @@ new-abi-baseline: # Use 'new-abi-baseline' to create an initial symbol file. Then run # 'check-abi' to test for changes against that file. -@GLIBCXX_TEST_ABI_TRUE@check-abi: abi_check baseline_symbols current_symbols.txt -@GLIBCXX_TEST_ABI_TRUE@ -@./abi_check --check ./current_symbols.txt ${baseline_file} \ -@GLIBCXX_TEST_ABI_TRUE@ 2>&1 | tee libstdc++-abi.sum -@GLIBCXX_TEST_ABI_TRUE@ -@cp libstdc++-abi.sum libstdc++-abi.log - -@GLIBCXX_TEST_ABI_TRUE@check-abi-verbose: abi_check baseline_symbols current_symbols.txt -@GLIBCXX_TEST_ABI_TRUE@ -@./abi_check --check-verbose ./current_symbols.txt ${baseline_file} \ -@GLIBCXX_TEST_ABI_TRUE@ 2>&1 | tee libstdc++-abi.sum -@GLIBCXX_TEST_ABI_TRUE@ -@cp libstdc++-abi.sum libstdc++-abi.log - +@GLIBCXX_TEST_ABI_TRUE@check-abi: baseline_symbols site.exp +@GLIBCXX_TEST_ABI_TRUE@ -@runtest --tool libstdc++ abi.exp @GLIBCXX_TEST_ABI_FALSE@check-abi: -@GLIBCXX_TEST_ABI_FALSE@check-abi-verbose: check-script: ${survey_script} -@(chmod + ${survey_script}; \ ${survey_script} 0)