diff options
| author | Iain Sandoe <iain@codesourcery.com> | 2014-05-16 20:56:03 +0000 |
|---|---|---|
| committer | Sandra Loosemore <sandra@gcc.gnu.org> | 2014-05-16 16:56:03 -0400 |
| commit | cac363bc3c6052afb2f9e67675488a3e17652df1 (patch) | |
| tree | 1515fef7f353c7c02036178201c861df207badb4 /libstdc++-v3 | |
| parent | b0e66512ee26dec9b4e20b612bab88f6163fe48a (diff) | |
| download | gcc-cac363bc3c6052afb2f9e67675488a3e17652df1.zip gcc-cac363bc3c6052afb2f9e67675488a3e17652df1.tar.gz gcc-cac363bc3c6052afb2f9e67675488a3e17652df1.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/libstdc++-abi/abi.exp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 96fe704..7dca067 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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> * testsuite/20_util/make_unsigned/requirements/typedefs-1.cc: Fix diff --git a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp index 9b381d8..0d657fb 100644 --- a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp +++ b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp @@ -24,8 +24,6 @@ if { [string match "*-*-darwin*" $target_triplet] } { set lib $blddir/src/.libs/libstdc++.so } -set baseline_subdir "[eval exec $cxx $baseline_subdir_switch]" - # Build the support objects. v3-build_support @@ -35,6 +33,8 @@ if { (${v3-symver} == 0) || ![info exists baseline_dir] \ return } +set baseline_subdir "[eval exec $cxx $baseline_subdir_switch]" + 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. |