diff options
| -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. |