From patchwork Mon Nov 8 15:39:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 70426 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]) by ozlabs.org (Postfix) with SMTP id C87DBB7105 for ; Tue, 9 Nov 2010 02:40:08 +1100 (EST) Received: (qmail 18605 invoked by alias); 8 Nov 2010 15:40:03 -0000 Received: (qmail 18545 invoked by uid 22791); 8 Nov 2010 15:40:02 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, TW_BF, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 08 Nov 2010 15:39:57 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 9737045F; Mon, 8 Nov 2010 16:39:55 +0100 (CET) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 5C2F0wsIFGBb; Mon, 8 Nov 2010 16:39:53 +0100 (CET) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 57A3145D; Mon, 8 Nov 2010 16:39:53 +0100 (CET) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.4+Sun/8.14.4/Submit) id oA8FdeYc004233; Mon, 8 Nov 2010 16:39:40 +0100 (MET) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: Anthony Green Subject: [libffi, testsuite] Rename libffi-dg.exp to libffi.exp Date: Mon, 08 Nov 2010 16:39:40 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes 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 I've noticed the following warning during libffi testsuite runs: WARNING: Couldn't find tool init file This happens because runtest looks for .exp, which is missing here, while there's lib/libffi-dg.exp instead which gets loaded explicitly in the driver files. This can easily be avoided by the following patch, as I see no point in having separate libffi.exp and libffi-dg.exp files. Tested on i386-pc-solaris2.11, ok for mainline? Rainer 2010-11-07 Rainer Orth * testsuite/lib/libffi-dg.exp: Rename ... * testsuite/lib/libffi.exp: ... to this. * libffi/testsuite/libffi.call/call.exp: Don't load libffi-dg.exp. * libffi/testsuite/libffi.special/special.exp: Likewise. diff -r d3034f477af0 libffi/testsuite/libffi.call/call.exp --- a/libffi/testsuite/libffi.call/call.exp Sun Nov 07 13:26:44 2010 +0100 +++ b/libffi/testsuite/libffi.call/call.exp Mon Nov 08 10:47:06 2010 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2003, 2006, 2009 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006, 2009, 2010 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,10 +14,6 @@ # along with this program; see the file COPYING3. If not see # . -# libffi testsuite that uses the 'dg.exp' driver. - -load_lib libffi-dg.exp - dg-init libffi-init diff -r d3034f477af0 libffi/testsuite/libffi.special/special.exp --- a/libffi/testsuite/libffi.special/special.exp Sun Nov 07 13:26:44 2010 +0100 +++ b/libffi/testsuite/libffi.special/special.exp Mon Nov 08 10:47:06 2010 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2003, 2006, 2009 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006, 2009, 2010 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,8 +14,6 @@ # along with this program; see the file COPYING3. If not see # . -load_lib libffi-dg.exp - dg-init libffi-init