Patchwork [libffi,testsuite] Rename libffi-dg.exp to libffi.exp

login
register
mail settings
Submitter Rainer Orth
Date Nov. 8, 2010, 3:39 p.m.
Message ID <yddhbfr4yf7.fsf@manam.CeBiTec.Uni-Bielefeld.DE>
Download mbox | patch
Permalink /patch/70426/
State New
Headers show

Comments

Rainer Orth - Nov. 8, 2010, 3:39 p.m.
I've noticed the following warning during libffi testsuite runs:

WARNING: Couldn't find tool init file

This happens because runtest looks for <toolname>.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  <ro@CeBiTec.Uni-Bielefeld.DE>

	* 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.

Patch

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
 # <http://www.gnu.org/licenses/>.
 
-# 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
 # <http://www.gnu.org/licenses/>.
 
-load_lib libffi-dg.exp
-
 dg-init
 libffi-init