procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly set ld_library_path in cilk-plus tests

Browse source 
* gcc.dg/cilk-plus/cilk-plus.exp: Append to ld_library_path.
	Call set_ld_library_path_env_vars.
	* g++.dg/cilk-plus/cilk-plus.exp: Likewise.

From-SVN: r205441
This commit is contained in:
Rainer Orth 2013-11-27 10:16:43 +00:00 • committed by Rainer Orth
parent 241b71bb88
commit a7d4a96bf7
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
2013-11-27 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* gcc.dg/cilk-plus/cilk-plus.exp: Append to ld_library_path.
Call set_ld_library_path_env_vars.
* g++.dg/cilk-plus/cilk-plus.exp: Likewise.
2013-11-27 Tom de Vries <tom@codesourcery.com>
Marc Glisse <marc.glisse@inria.fr>

3
gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp
View file

@ -31,7 +31,8 @@ dg-finish
set library_var [get_multilibs]
# Pointing the ld_library_path to the Cilk Runtime library binaries.
set ld_library_path "${library_var}/libcilkrts/.libs"
append ld_library_path ":${library_var}/libcilkrts/.libs"
set_ld_library_path_env_vars
global TEST_EXTRA_LIBS
set TEST_EXTRA_LIBS "-L${library_var}/libcilkrts/.libs"

3
gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp
View file

@ -26,7 +26,8 @@ if { ![check_effective_target_cilkplus] } {
set library_var [get_multilibs]
# Pointing the ld_library_path to the Cilk Runtime library binaries.
set ld_library_path "${library_var}/libcilkrts/.libs"
append ld_library_path ":${library_var}/libcilkrts/.libs"
set_ld_library_path_env_vars
global TEST_EXTRA_LIBS
set TEST_EXTRA_LIBS "-L${library_var}/libcilkrts/.libs"