From a7d4a96bf73a4609d596dcec1793f80ac3e9c5ac Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Wed, 27 Nov 2013 10:16:43 +0000 Subject: [PATCH] Properly set ld_library_path in cilk-plus tests * 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 --- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp | 3 ++- gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6cf7c386ae69..95745e10f4a8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2013-11-27 Rainer Orth + + * 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 Marc Glisse diff --git a/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp b/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp index a66ec44f2977..707d17ec5e42 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp +++ b/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp @@ -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" diff --git a/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp b/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp index dc66fcb4c0c0..39abbba3fbc5 100644 --- a/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp +++ b/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp @@ -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" -- 2.47.3