diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2013-12-14 15:30:45 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2013-12-14 15:30:45 +0000 |
| commit | 0ec48735163f6e08803900926770a9d0ed3fe04a (patch) | |
| tree | d9755b77e23774e6590e349c7fb5a4ccc1fe24d3 | |
| parent | 8263440b3210b97ee6112faf5ff9d519de78af02 (diff) | |
| download | gcc-0ec48735163f6e08803900926770a9d0ed3fe04a.zip gcc-0ec48735163f6e08803900926770a9d0ed3fe04a.tar.gz gcc-0ec48735163f6e08803900926770a9d0ed3fe04a.tar.bz2 | |
* g++.dg/cilk-plus/cilk-plus.exp: Fix last change.
From-SVN: r205987
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a53133b..1bb5bca 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2013-12-14 Andreas Schwab <schwab@linux-m68k.org> + + * g++.dg/cilk-plus/cilk-plus.exp: Fix last change. + 2013-12-14 Eric Botcazou <ebotcazou@adacore.com> * var-tracking.c (add_stores): Fix oversight in latest commit. diff --git a/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp b/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp index cb27418..2f7fcb7 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp +++ b/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp @@ -22,8 +22,7 @@ if { ![check_effective_target_cilkplus] } { return; } -verbose "$tool $libdir" 1 -set library_var "[get_multilibs]" +set library_var [get_multilibs] # Pointing the ld_library_path to the Cilk Runtime library binaries. append ld_library_path ":${library_var}/libcilkrts/.libs" set_ld_library_path_env_vars @@ -38,14 +37,6 @@ g++-dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/PS/*.c]] g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] "" dg-finish -set library_var [get_multilibs] -# Pointing the ld_library_path to the Cilk Runtime library binaries. -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" - dg-init dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus" " " dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O1 -fcilkplus" " " |