Makefile.am (check-local): Remove.
* testsuite/Makefile.am (check-local): Remove. (curent_symbols.txt): Likewise. (check-abi): Do not depend on current_symbols.txt. * testsuite/Makefile.in: Regenerated. * testsuite/libstdc++-abi/abi.exp: Build current_symbols.txt. From-SVN: r97558
This commit is contained in:
parent
38a37714e6
commit
e3e87ef009
|
@ -1,3 +1,11 @@
|
||||||
|
2005-04-04 Mark Mitchell <mark@codesourcery.com>
|
||||||
|
|
||||||
|
* testsuite/Makefile.am (check-local): Remove.
|
||||||
|
(curent_symbols.txt): Likewise.
|
||||||
|
(check-abi): Do not depend on current_symbols.txt.
|
||||||
|
* testsuite/Makefile.in: Regenerated.
|
||||||
|
* testsuite/libstdc++-abi/abi.exp: Build current_symbols.txt.
|
||||||
|
|
||||||
2005-04-02 Douglas Gregor <doug.gregor@gmail.com>
|
2005-04-02 Douglas Gregor <doug.gregor@gmail.com>
|
||||||
|
|
||||||
* include/tr1/tuple_iterate.h (tuple_element): Use new macro
|
* include/tr1/tuple_iterate.h (tuple_element): Use new macro
|
||||||
|
|
|
@ -103,15 +103,9 @@ site.exp: Makefile
|
||||||
@test ! -f site.exp || mv site.exp site.bak
|
@test ! -f site.exp || mv site.exp site.bak
|
||||||
@mv site.tmp site.exp
|
@mv site.tmp site.exp
|
||||||
|
|
||||||
# This is automatically run after the generated check-DEJAGNU rule.
|
|
||||||
check-local: check-abi
|
|
||||||
|
|
||||||
baseline_file = ${baseline_dir}/baseline_symbols.txt
|
baseline_file = ${baseline_dir}/baseline_symbols.txt
|
||||||
extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers
|
extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers
|
||||||
|
|
||||||
current_symbols.txt: ${extract_symvers} ../src/.libs/libstdc++.so
|
|
||||||
-@(${extract_symvers} ../src/.libs/libstdc++.so current_symbols.txt)
|
|
||||||
|
|
||||||
baseline_symbols:
|
baseline_symbols:
|
||||||
-@(output=${baseline_file}; \
|
-@(output=${baseline_file}; \
|
||||||
if test ! -f $${output}; then \
|
if test ! -f $${output}; then \
|
||||||
|
@ -133,7 +127,7 @@ new-abi-baseline:
|
||||||
if GLIBCXX_TEST_ABI
|
if GLIBCXX_TEST_ABI
|
||||||
# Use 'new-abi-baseline' to create an initial symbol file. Then run
|
# Use 'new-abi-baseline' to create an initial symbol file. Then run
|
||||||
# 'check-abi' to test for changes against that file.
|
# 'check-abi' to test for changes against that file.
|
||||||
check-abi: baseline_symbols current_symbols.txt site.exp
|
check-abi: baseline_symbols site.exp
|
||||||
-@runtest --tool libstdc++ abi.exp
|
-@runtest --tool libstdc++ abi.exp
|
||||||
else
|
else
|
||||||
check-abi:
|
check-abi:
|
||||||
|
|
|
@ -475,7 +475,7 @@ distdir: $(DISTFILES)
|
||||||
fi; \
|
fi; \
|
||||||
done
|
done
|
||||||
check-am: all-am
|
check-am: all-am
|
||||||
$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check-local
|
$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
|
||||||
check: check-am
|
check: check-am
|
||||||
all-am: Makefile $(LIBRARIES) all-local
|
all-am: Makefile $(LIBRARIES) all-local
|
||||||
installdirs:
|
installdirs:
|
||||||
|
@ -554,17 +554,16 @@ ps-am:
|
||||||
uninstall-am: uninstall-info-am
|
uninstall-am: uninstall-info-am
|
||||||
|
|
||||||
.PHONY: CTAGS GTAGS all all-am all-local check check-DEJAGNU check-am \
|
.PHONY: CTAGS GTAGS all all-am all-local check check-DEJAGNU check-am \
|
||||||
check-local clean clean-generic clean-libtool \
|
clean clean-generic clean-libtool clean-noinstLIBRARIES ctags \
|
||||||
clean-noinstLIBRARIES ctags distclean distclean-DEJAGNU \
|
distclean distclean-DEJAGNU distclean-compile \
|
||||||
distclean-compile distclean-generic distclean-libtool \
|
distclean-generic distclean-libtool distclean-tags distdir dvi \
|
||||||
distclean-tags distdir dvi dvi-am html html-am info info-am \
|
dvi-am html html-am info info-am install install-am \
|
||||||
install install-am install-data install-data-am install-exec \
|
install-data install-data-am install-exec install-exec-am \
|
||||||
install-exec-am install-info install-info-am install-man \
|
install-info install-info-am install-man install-strip \
|
||||||
install-strip installcheck installcheck-am installdirs \
|
installcheck installcheck-am installdirs maintainer-clean \
|
||||||
maintainer-clean maintainer-clean-generic mostlyclean \
|
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||||
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
||||||
pdf pdf-am ps ps-am tags uninstall uninstall-am \
|
tags uninstall uninstall-am uninstall-info-am
|
||||||
uninstall-info-am
|
|
||||||
|
|
||||||
|
|
||||||
all-local: stamp_wchar stamp_thread
|
all-local: stamp_wchar stamp_thread
|
||||||
|
@ -606,12 +605,6 @@ site.exp: Makefile
|
||||||
@test ! -f site.exp || mv site.exp site.bak
|
@test ! -f site.exp || mv site.exp site.bak
|
||||||
@mv site.tmp site.exp
|
@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:
|
baseline_symbols:
|
||||||
-@(output=${baseline_file}; \
|
-@(output=${baseline_file}; \
|
||||||
if test ! -f $${output}; then \
|
if test ! -f $${output}; then \
|
||||||
|
@ -632,7 +625,7 @@ new-abi-baseline:
|
||||||
|
|
||||||
# Use 'new-abi-baseline' to create an initial symbol file. Then run
|
# Use 'new-abi-baseline' to create an initial symbol file. Then run
|
||||||
# 'check-abi' to test for changes against that file.
|
# 'check-abi' to test for changes against that file.
|
||||||
@GLIBCXX_TEST_ABI_TRUE@check-abi: baseline_symbols current_symbols.txt site.exp
|
@GLIBCXX_TEST_ABI_TRUE@check-abi: baseline_symbols site.exp
|
||||||
@GLIBCXX_TEST_ABI_TRUE@ -@runtest --tool libstdc++ abi.exp
|
@GLIBCXX_TEST_ABI_TRUE@ -@runtest --tool libstdc++ abi.exp
|
||||||
@GLIBCXX_TEST_ABI_FALSE@check-abi:
|
@GLIBCXX_TEST_ABI_FALSE@check-abi:
|
||||||
check-script: ${survey_script}
|
check-script: ${survey_script}
|
||||||
|
|
|
@ -14,11 +14,18 @@
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
# If there is no current_symbols.txt file, then skip this test.
|
# If there is no baseline file, or we can't find the library, skip
|
||||||
if { ![file exists "current_symbols.txt"] } {
|
# this test.
|
||||||
|
if { ![info exists baseline_file] \
|
||||||
|
|| ![file exists $baseline_file] \
|
||||||
|
|| ![file exists "../src/.libs/libstdc++.so"] } {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Figure out what symbols are defined by the active build of the library.
|
||||||
|
remote_exec "build" "$srcdir/../scripts/extract_symvers" \
|
||||||
|
[list "../src/.libs/libstdc++.so" "current_symbols.txt"]
|
||||||
|
|
||||||
# Build the support objects.
|
# Build the support objects.
|
||||||
v3-build_support
|
v3-build_support
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue