From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat, 14 Dec 2013 15:30:45 +0000 (+0000)
Subject: * g++.dg/cilk-plus/cilk-plus.exp: Fix last change.
X-Git-Tag: upstream/12.2.0~65894
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ec48735163f6e08803900926770a9d0ed3fe04a;p=platform%2Fupstream%2Fgcc.git

* g++.dg/cilk-plus/cilk-plus.exp: Fix last change.

From-SVN: r205987
---

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" " "