[testsuite] Unset 'offload_target' after use

..., so that we don't leak this into '*.exp' files running later.

This is relevant after commit efc16503ca "handle
dumpbase in offloading, adjust testsuite" -- I was confused why in a
(simplified) testing sequence as follows:

  default 'libgomp.c/c.exp'
  default 'libgomp.oacc-c/c.exp'
  '-m32' 'libgomp.c/c.exp'
  '-m32' 'libgomp.oacc-c/c.exp'

..., the "'-m32' 'libgomp.c/c.exp'" variant would not execute any offloading
dump scanning.  The reason is that the "default 'libgomp.oacc-c/c.exp'" variant
ends with 'offload_target=disable' set, so that's what the "'-m32'
'libgomp.c/c.exp'" variant would then see, in particular
'gcc/testsuite/lib/scanoffload.exp:scoff'.

	libgomp/
	* testsuite/libgomp.oacc-c++/c++.exp: Unset 'offload_target' after
	use.
	* testsuite/libgomp.oacc-c/c.exp: Likewise.
	* testsuite/libgomp.oacc-fortran/fortran.exp: Likewise.
This commit is contained in:
Thomas Schwinge 2020-07-01 12:33:59 +02:00
parent 3407bfc136
commit fdc9db2539
3 changed files with 3 additions and 0 deletions

View file

@ -149,6 +149,7 @@ if { $lang_test_file_found } {
gcc-dg-runtest $tests "$tagopt" "$libstdcxx_includes"
}
unset offload_target
} else {
# Call this once, which placates the subsequent torture-finish.
set-torture-options [list \

View file

@ -112,6 +112,7 @@ foreach offload_target [concat [split $offload_targets ","] "disable"] {
gcc-dg-runtest $tests "$tagopt" ""
}
unset offload_target
# All done.
torture-finish

View file

@ -121,6 +121,7 @@ if { $lang_test_file_found } {
# typically not the case for C/C++.
gfortran-dg-runtest $tests "$tagopt" ""
}
unset offload_target
}
# All done.