gcc/testsuite/ 2014-12-04 Yvan Roux <yvan.roux@linaro.org>

	Backport from trunk r216543.
	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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/linaro/gcc-4_9-branch@218380 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog.linaro b/gcc/testsuite/ChangeLog.linaro
index 64febaa..fc3e9a1 100644 (file)
--- a/gcc/testsuite/ChangeLog.linaro
+++ b/gcc/testsuite/ChangeLog.linaro
@@ -1,5 +1,14 @@
 2014-12-04  Yvan Roux  <yvan.roux@linaro.org>
 
+       Backport from trunk r216543.
+       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-12-04  Yvan Roux  <yvan.roux@linaro.org>
+
        Backport from trunk r216517.
        2014-10-21  Jiong Wang  <jiong.wang@arm.com>
 

diff --git a/gcc/testsuite/lib/compat.exp b/gcc/testsuite/lib/compat.exp
index 7ab85aa..45cf0e0 100644 (file)
--- 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 69a5971..dcd30e8 100644 (file)
--- 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