From patchwork Sat Dec 14 15:32:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 301262 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DAB552C009A for ; Sun, 15 Dec 2013 02:32:40 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; q=dns; s=default; b=ABl/BEzxsRECIFqm gA+Fq5Ww3u50f8XSNKUbgnU/sgXn8oxUmpexvleGBULFs1sKCOQwiKBpvMERAKuP 1aqr8/6hnTYp60PuWRX/pqo6fXzZ0zw6882wVDMMBcJXnCr/oR2M0aGSqnfIT0If Tc9eiPifvkLknIgP0ReM8QyJaQA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; s=default; bh=49jU19H0+7NLZg9oNLNCf+ dqaV8=; b=B+txgwKTtAkv80TYr0dzNNWVOqyDSAU8ZceO9hc7bi82lNZ7sNa2Rs ZNd+k1WHLzdytuGdJ+fz5suOF/EJY+Oqk01vWCkgWd1hUt7cYmXHpsN0mFoQHYBw sQ9kRhvdDg+uHu9JZHSOHKALtWfI/hKeB8k6mFLxKzktZkrpcI4EM= Received: (qmail 30703 invoked by alias); 14 Dec 2013 15:32:34 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 30694 invoked by uid 89); 14 Dec 2013 15:32:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 X-HELO: mail-out.m-online.net Received: from mail-out.m-online.net (HELO mail-out.m-online.net) (212.18.0.9) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Sat, 14 Dec 2013 15:32:32 +0000 Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3dhXmr4cGpz4KK3g; Sat, 14 Dec 2013 16:32:28 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3dhXmr3l9czbbfj; Sat, 14 Dec 2013 16:32:28 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id Bj4ib8PoTCDS; Sat, 14 Dec 2013 16:32:27 +0100 (CET) X-Auth-Info: w4/3XZcFPN4wgdNjHEianQsYcYUus015CyTLnPBjnIo= Received: from igel.home (ppp-46-244-228-39.dynamic.mnet-online.de [46.244.228.39]) by mail.mnet-online.de (Postfix) with ESMTPA; Sat, 14 Dec 2013 16:32:27 +0100 (CET) Received: by igel.home (Postfix, from userid 1000) id 56B582C3757; Sat, 14 Dec 2013 16:32:26 +0100 (CET) From: Andreas Schwab To: Rainer Orth Cc: gcc-patches@gcc.gnu.org, "Balaji V. Iyer" Subject: Re: [testsuite] Fix g++.dg/cilk-plus/cilk-plus.exp References: <87wqj8pr19.fsf@igel.home> X-Yow: WHO sees a BEACH BUNNY sobbing on a SHAG RUG?! Date: Sat, 14 Dec 2013 16:32:26 +0100 In-Reply-To: (Rainer Orth's message of "Fri, 13 Dec 2013 19:15:15 +0100") Message-ID: <87bo0jphx1.fsf@igel.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 * gcc.dg/cilk-plus/cilk-plus.exp: Fix last change. 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" " "