diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++.exp | 21 |
2 files changed, 25 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0c125ec..68e3c14 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2014-12-12 Kyrylo Tkachov <kyrylo.tkachov@arm.com> + + * testsuite/lib/libstdc++.exp: Include target-utils.exp. + (v3_target_compile): Check if test is unsupported. + (v3_target_compile_as_c): Likewise. + 2014-12-11 Jason Merrill <jason@redhat.com> * libsupc++/new (bad_array_length): Move... diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 3d9913b..45dbca9 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -57,6 +57,7 @@ load_gcc_lib target-libpath.exp load_gcc_lib timeout.exp load_gcc_lib timeout-dg.exp load_gcc_lib wrapper.exp +load_gcc_lib target-utils.exp # Useful for debugging. Pass the name of a variable and the verbosity # threshold (number of -v's on the command line). @@ -455,6 +456,7 @@ proc v3_target_compile { source dest type options } { global cxxldflags global includes global STATIC_LIBCXXFLAGS + global tool if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } { lappend options "libs=${gluefile}" @@ -483,7 +485,14 @@ proc v3_target_compile { source dest type options } { lappend options "compiler=$cxx_final" lappend options "timeout=[timeout_value]" - return [target_compile $source $dest $type $options] + set comp_output [target_compile $source $dest $type $options] + set unsupported_message [${tool}_check_unsupported_p $comp_output] + + if { $unsupported_message != "" } { + unsupported "$dest: $unsupported_message" + return "" + } + return $comp_output } @@ -498,6 +507,7 @@ proc v3_target_compile_as_c { source dest type options } { global cc global cxxflags global STATIC_LIBCXXFLAGS + global tool if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } { lappend options "libs=${gluefile}" @@ -551,7 +561,14 @@ proc v3_target_compile_as_c { source dest type options } { lappend options "compiler=$cc_final" lappend options "timeout=[timeout_value]" - return [target_compile $source $dest $type $options] + set comp_output [target_compile $source $dest $type $options] + set unsupported_message [${tool}_check_unsupported_p $comp_output] + + if { $unsupported_message != "" } { + unsupported "$dest: $unsupported_message" + return "" + } + return $comp_output } # Build the support objects linked in with the libstdc++ tests. In |