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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ee962c9..17436c8 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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>
        
        * include/tr1/tuple_iterate.h (tuple_element): Use new macro

diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index 3cfa19b..090dc3d 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -103,15 +103,9 @@ 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
-
 baseline_file = ${baseline_dir}/baseline_symbols.txt
 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:
        -@(output=${baseline_file}; \
          if test ! -f $${output}; then \
@@ -133,7 +127,7 @@ new-abi-baseline:
 if GLIBCXX_TEST_ABI
 # Use 'new-abi-baseline' to create an initial symbol file.  Then run
 # '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
 else
 check-abi:

diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index d62b56a..c96fabc 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -475,7 +475,7 @@ 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) all-local
 installdirs:
@@ -554,17 +554,16 @@ 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 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
+       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
@@ -606,12 +605,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 \
@@ -632,7 +625,7 @@ 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: 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_FALSE@check-abi:
 check-script: ${survey_script}

diff --git a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp
index 12504f9..ba774f1 100644 (file)
--- a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp
+++ b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp
@@ -14,11 +14,18 @@
 # along with this program; if not, write to the Free Software
 # 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 { ![file exists "current_symbols.txt"] } {
+# If there is no baseline file, or we can't find the library, skip
+# this test.
+if { ![info exists baseline_file] \
+        || ![file exists $baseline_file] \
+        || ![file exists "../src/.libs/libstdc++.so"] } {
     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.
 v3-build_support