From c1cadde1cbd95e051885c3c9c5794a8d8c64e27a Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 26 Jan 2017 20:37:08 +0100
Subject: [PATCH] * testsuite/lib/libgomp.exp 
 (check_effective_target_hsa_offloading_selected_nocache): Fix up 
 check_compile invocation.  Fix up removal of executable.  Drop 	bogus
 "2>&1" argument.

From-SVN: r244948
---
 libgomp/ChangeLog                 | 5 +++++
 libgomp/testsuite/lib/libgomp.exp | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index b10ed3545d4..b4e7d6ef6d1 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,5 +1,10 @@
 2017-01-26  Jakub Jelinek  <jakub@redhat.com>
 
+	* testsuite/lib/libgomp.exp
+	(check_effective_target_hsa_offloading_selected_nocache): Fix up
+	check_compile invocation.  Fix up removal of executable.  Drop
+	bogus "2>&1" argument.
+
 	* testsuite/libgomp.fortran/declare-simd-4.f90: Add cleanup-modules
 	directive.
 
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 50ec8a7fa95..5e47872c5c4 100644
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -408,16 +408,16 @@ proc check_effective_target_hsa_offloading_selected_nocache {} {
 	}
     }
     
-    set result [eval [list check_compile hsa_offloading_src executable $src] ""]
+    set result [check_compile hsa_offloading_src executable $src]
     set lines [lindex $result 0]
-    set output [lindex $result 1]
+    set exe [lindex $result 1]
 
     set ok 0
     if { [string match "" $lines] } {
 	# No error messages, let us switch on HSA debugging output and run it
 	set prev_HSA_DEBUG [getenv HSA_DEBUG]
 	setenv HSA_DEBUG "1"
-	set result [remote_load target "./$output" "2>&1" ""]
+	set result [remote_load target "./$exe"]
 	if { [string match "" $prev_HSA_DEBUG] } {
 	    unsetenv HSA_DEBUG
 	} else {
@@ -425,6 +425,7 @@ proc check_effective_target_hsa_offloading_selected_nocache {} {
 	}
 	set status [lindex $result 0]
 	if { $status != "pass" } {
+	    remote_file build delete $exe
 	    verbose "HSA availability test failed"
 	    return 0
 	}
@@ -434,7 +435,7 @@ proc check_effective_target_hsa_offloading_selected_nocache {} {
 	    set ok 1
 	}
     }
-    remote_file build delete $output
+    remote_file build delete $exe
     return $ok
 }
 
-- 
2.30.2