diff options
| author | Jiong Wang <jiong.wang@arm.com> | 2014-10-22 08:44:44 +0000 |
|---|---|---|
| committer | Jiong Wang <jiwang@gcc.gnu.org> | 2014-10-22 08:44:44 +0000 |
| commit | 188979acda77d083a006eb6589651fcf9aa70c18 (patch) | |
| tree | 938320480d4affc005606c649a276522600fb641 | |
| parent | 3d2cf79f8112e357327a1a8a1765ab1c6022244c (diff) | |
| download | gcc-188979acda77d083a006eb6589651fcf9aa70c18.zip gcc-188979acda77d083a006eb6589651fcf9aa70c18.tar.gz gcc-188979acda77d083a006eb6589651fcf9aa70c18.tar.bz2 | |
[Dejagnu] fix gcc-dg-prune glitch when filtering "relocation truncation" error
gcc/testsuite/
* lib/compat.exp (compat-run): Remove "unresolved".
* lib/gcc-defs.exp (${tools}_check_compile): Update code logic for
unsupported testcase.
From-SVN: r216543
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/lib/compat.exp | 1 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gcc-defs.exp | 17 |
3 files changed, 17 insertions, 7 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fa09a9c..b11d3a9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-10-22 Jiong Wang <jiong.wang@arm.com> + + * lib/compat.exp (compat-run): Remove "unresolved". + * lib/gcc-defs.exp (${tools}_check_compile): Update code logic for + unsupported testcase. + 2014-10-22 Jakub Jelinek <jakub@redhat.com> PR target/63594 diff --git a/gcc/testsuite/lib/compat.exp b/gcc/testsuite/lib/compat.exp index 7ab85aa..45cf0e0 100644 --- a/gcc/testsuite/lib/compat.exp +++ b/gcc/testsuite/lib/compat.exp @@ -134,7 +134,6 @@ proc compat-run { testname objlist dest optall optfile optstr } { "$options"] if ![${tool}_check_compile "$testcase $testname link" "" \ $dest $comp_output] then { - unresolved "$testcase $testname execute $optstr" return } diff --git a/gcc/testsuite/lib/gcc-defs.exp b/gcc/testsuite/lib/gcc-defs.exp index cb93238..d479667 100644 --- a/gcc/testsuite/lib/gcc-defs.exp +++ b/gcc/testsuite/lib/gcc-defs.exp @@ -54,12 +54,17 @@ proc ${tool}_check_compile {testcase option objname gcc_output} { if { [info proc ${tool}-dg-prune] != "" } { global target_triplet set gcc_output [${tool}-dg-prune $target_triplet $gcc_output] - } - - set unsupported_message [${tool}_check_unsupported_p $gcc_output] - if { $unsupported_message != "" } { - unsupported "$testcase: $unsupported_message" - return 0 + if [string match "*::unsupported::*" $gcc_output] then { + regsub -- "::unsupported::" $gcc_output "" gcc_output + unsupported "$testcase: $gcc_output" + return 0 + } + } else { + set unsupported_message [${tool}_check_unsupported_p $gcc_output] + if { $unsupported_message != "" } { + unsupported "$testcase: $unsupported_message" + return 0 + } } # remove any leftover LF/CR to make sure any output is legit |