From da177fdfc57a4764119882352aa3e2dbeab9a247 Mon Sep 17 00:00:00 2001 From: nemet Date: Mon, 23 Feb 2009 20:42:53 +0000 Subject: [PATCH] * testsuite/libstdc++-abi/abi.exp: Add multilib support. * acinclude.m4 (GLIBCXX_CONFIGURE_TESTSUITE): Remove MULTISUBDIR from baseline_dir. * configure: Regenerate. * testsuite/Makefile.am (baseline_file): Remove variable. (site.exp): Set baseline_dir rather than baseline_file. (check-abi): Pass AM_RUNTESTFLAGS and RUNTESTFLAGS to runtest. * testsuite/Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@144394 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 11 +++++++++++ libstdc++-v3/acinclude.m4 | 2 +- libstdc++-v3/configure | 2 +- libstdc++-v3/testsuite/Makefile.am | 5 ++--- libstdc++-v3/testsuite/Makefile.in | 5 ++--- libstdc++-v3/testsuite/libstdc++-abi/abi.exp | 22 ++++++++++++++++++---- 6 files changed, 35 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fd8bf05c784..dbdcaf6f2ba 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2009-02-23 Adam Nemet + + * testsuite/libstdc++-abi/abi.exp: Add multilib support. + * acinclude.m4 (GLIBCXX_CONFIGURE_TESTSUITE): Remove MULTISUBDIR + from baseline_dir. + * configure: Regenerate. + * testsuite/Makefile.am (baseline_file): Remove variable. + (site.exp): Set baseline_dir rather than baseline_file. + (check-abi): Pass AM_RUNTESTFLAGS and RUNTESTFLAGS to runtest. + * testsuite/Makefile.in: Regenerate. + 2009-02-20 Benjamin Kosnik * testsuite/30_threads/thread/this_thread: Move... diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 22e6bc49c5a..186916c2e47 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -638,7 +638,7 @@ AC_DEFUN([GLIBCXX_CONFIGURE_TESTSUITE], [ fi # Export file names for ABI checking. - baseline_dir="$glibcxx_srcdir/config/abi/post/${abi_baseline_pair}\$(MULTISUBDIR)" + baseline_dir="$glibcxx_srcdir/config/abi/post/${abi_baseline_pair}" AC_SUBST(baseline_dir) ]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index d11accaf082..3dd646931c8 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -117983,7 +117983,7 @@ done fi # Export file names for ABI checking. - baseline_dir="$glibcxx_srcdir/config/abi/post/${abi_baseline_pair}\$(MULTISUBDIR)" + baseline_dir="$glibcxx_srcdir/config/abi/post/${abi_baseline_pair}" diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index 14ce3b7bf4c..2f239ff99cb 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -58,7 +58,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 'set baseline_dir "$(baseline_dir)"' >> 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,7 +67,6 @@ site.exp: Makefile @mv site.tmp site.exp -baseline_file = ${baseline_dir}/baseline_symbols.txt extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers baseline_symbols: @@ -165,7 +164,7 @@ check-am: # Use 'new-abi-baseline' to create an initial symbol file. Then run # 'check-abi' to test for changes against that file. check-abi: site.exp baseline_symbols - -@runtest --tool libstdc++ abi.exp + -@runtest $(AM_RUNTESTFLAGS) --tool libstdc++ $(RUNTESTFLAGS) abi.exp # Runs the testsuite, but in compile only mode. # Can be used to test sources with non-GNU FE's at various warning diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 00a51b48fa4..47e93e13195 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -299,7 +299,6 @@ lists_of_files = \ testsuite_files_interactive \ testsuite_files_performance -baseline_file = ${baseline_dir}/baseline_symbols.txt extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3) @@ -517,7 +516,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 'set baseline_dir "$(baseline_dir)"' >> 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,7 +617,7 @@ check-am: # Use 'new-abi-baseline' to create an initial symbol file. Then run # 'check-abi' to test for changes against that file. check-abi: site.exp baseline_symbols - -@runtest --tool libstdc++ abi.exp + -@runtest $(AM_RUNTESTFLAGS) --tool libstdc++ $(RUNTESTFLAGS) abi.exp check-compile: testsuite_files ${compile_script} -@(chmod + ${compile_script}; \ ${compile_script} ${glibcxx_srcdir} ${glibcxx_builddir}) diff --git a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp index b3f5b3b59be..2c8da227a99 100644 --- a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp +++ b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp @@ -18,18 +18,32 @@ # this test. Or, hey, if we don't support this kind of symbol # versioning test: don't run it. +set lib $blddir/src/.libs/libstdc++.so +set baseline_subdir "[eval exec $cxx --print-multi-dir]" + # Build the support objects. v3-build_support -if { (${v3-symver} == 0) || ![info exists baseline_file] \ - || ![file exists $baseline_file] \ - || ![file exists "../src/.libs/libstdc++.so"] } { +if { (${v3-symver} == 0) || ![info exists baseline_dir] \ + || ![file exists $baseline_dir] \ + || ![file exists $lib] } { + return +} + +set baseline_file \ + [file join $baseline_dir $baseline_subdir "baseline_symbols.txt"] +# If there is no ABI-specific reference file use that of the default ABI. +if ![file exists $baseline_file] { + set baseline_file [file join $baseline_dir "baseline_symbols.txt"] +} +if ![file exists $baseline_file] { return } +send_log "Checking $lib against $baseline_file\n" # 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"] + [list $lib "current_symbols.txt"] # Build the abi_check program. if { [v3_target_compile "$srcdir/util/testsuite_abi_check.cc" "abi_check" \ -- 2.11.0