git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

abi.exp: Defer setting of baseline_subdir until after checking that the test is eligible... 

2014-05-16  Iain Sandoe  <iain@codesourcery.com>
	    Sandra Loosemore  <sandra@codesourcery.com>

        libstdc++-v3/
        * testsuite/libstdc++-abi/abi.exp: Defer setting of baseline_subdir
        until after checking that the test is eligible to be run.

Co-Authored-By: Sandra Loosemore <sandra@codesourcery.com>

From-SVN: r210531
This commit is contained in:
Iain Sandoe 2014-05-16 20:56:03 +00:00 committed by Sandra Loosemore
parent b0e66512ee
commit cac363bc3c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2014-05-16 Iain Sandoe <iain@codesourcery.com>
Sandra Loosemore <sandra@codesourcery.com>
* testsuite/libstdc++-abi/abi.exp: Defer setting of baseline_subdir
until after checking that the test is eligible to be run.
2014-05-16 Jonathan Wakely <jwakely@redhat.com> 2014-05-16 Jonathan Wakely <jwakely@redhat.com>
* testsuite/20_util/make_unsigned/requirements/typedefs-1.cc: Fix * testsuite/20_util/make_unsigned/requirements/typedefs-1.cc: Fix

4
libstdc++-v3/testsuite/libstdc++-abi/abi.exp
View File

@ -24,8 +24,6 @@ if { [string match "*-*-darwin*" $target_triplet] } {
set lib $blddir/src/.libs/libstdc++.so set lib $blddir/src/.libs/libstdc++.so
} }
set baseline_subdir "[eval exec $cxx $baseline_subdir_switch]"
# Build the support objects. # Build the support objects.
v3-build_support v3-build_support
@ -35,6 +33,8 @@ if { (${v3-symver} == 0) || ![info exists baseline_dir] \
return return
} }
set baseline_subdir "[eval exec $cxx $baseline_subdir_switch]"
set baseline_file \ set baseline_file \
[file join $baseline_dir $baseline_subdir "baseline_symbols.txt"] [file join $baseline_dir $baseline_subdir "baseline_symbols.txt"]
# If there is no ABI-specific reference file use that of the default ABI. # If there is no ABI-specific reference file use that of the default ABI.