* 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
This commit is contained in:
Jakub Jelinek 2017-01-26 20:37:08 +01:00 committed by Jakub Jelinek
parent 41d3d0ac40
commit c1cadde1cb
2 changed files with 10 additions and 4 deletions

View file

@ -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.

View file

@ -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
}