[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Followup patch: fix mingw cross-compile regressions
From: |
Charles Wilson |
Subject: |
Followup patch: fix mingw cross-compile regressions |
Date: |
Thu, 12 Jul 2007 02:41:12 -0400 |
User-agent: |
Thunderbird 1.5.0.12 (Windows/20070509) |
While testing an earlier patch of mine, Ralf reported some old testsuite
failures when cross-compiling for mingw from linux:
Grepping the verbose output of the old HEAD testsuite for 'No such file
or directory' shows several bits that need adjustment, too.
The attached adds $EXEEXT in the appropriate places. Tested on cygwin
(native) and linux (native) with no regressions. However, I have NOT
tested it in Ralf's use case, which is what it is intended to fix --
somebody else needs to make sure I haven't actually made things worse,
there.
ChangeLog
2007-07-11 Charles Wilson <...>
* tests/cdemo-exec.test: use $EXEEXT where appropriate
to correct mingw cross-compile issues.
* demo-deplibs.test: Ditto.
* demo-exec.test: Ditto.
* demo-inst.test: Ditto.
* demo-relink.test: Ditto.
* depdemo-exec.test: Ditto.
* depdemo-inst.test: Ditto.
* depdemo-relink.test: Ditto.
* f77demo-exec.test: Ditto.
* fcdemo-exec.test: Ditto.
* mdemo-exec.test: Ditto.
* mdemo-inst.test: Ditto.
* mdemo2-exec.test: Ditto.
* pdemo-exec.test: Ditto.
* pdemo-inst.test: Ditto.
* tagdemo-exec.test: Ditto.
--
Chuck
Index: tests/cdemo-exec.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/cdemo-exec.test,v
retrieving revision 1.11
diff -u -r1.11 cdemo-exec.test
--- tests/cdemo-exec.test 25 Mar 2007 12:12:43 -0000 1.11
+++ tests/cdemo-exec.test 12 Jul 2007 03:04:24 -0000
@@ -29,6 +29,6 @@
func_rmprefixdir
func_exec_init "uninstalled"
-func_exec "tests/cdemo/cdemo"
+func_exec "tests/cdemo/cdemo$EXEEXT"
exit $exec_status
Index: tests/demo-deplibs.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/demo-deplibs.test,v
retrieving revision 1.8
diff -u -r1.8 demo-deplibs.test
--- tests/demo-deplibs.test 25 Mar 2007 12:12:43 -0000 1.8
+++ tests/demo-deplibs.test 12 Jul 2007 03:04:24 -0000
@@ -33,6 +33,6 @@
func_make "deplibs-check"
func_exec_init "uninstalled"
func_exec_check "hell0$EXEEXT" "check your deplibs_check_method"
-func_exec "./hell0" "" "check your deplibs_check_method"
+func_exec "./hell0$EXEEXT" "" "check your deplibs_check_method"
exit $exec_status
Index: tests/demo-exec.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/demo-exec.test,v
retrieving revision 1.16
diff -u -r1.16 demo-exec.test
--- tests/demo-exec.test 25 Mar 2007 12:12:43 -0000 1.16
+++ tests/demo-exec.test 12 Jul 2007 03:04:24 -0000
@@ -29,8 +29,8 @@
func_rmprefixdir
func_exec_init "uninstalled"
-func_exec "tests/demo/hell_static" 'Welcome to GNU Hell'
-func_exec "tests/demo/hell" 'Welcome to GNU Hell'
-func_exec "tests/demo/helldl" '(Welcome to .*GNU Hell|unsupported)'
+func_exec "tests/demo/hell_static$EXEEXT" 'Welcome to GNU Hell'
+func_exec "tests/demo/hell$EXEEXT" 'Welcome to GNU Hell'
+func_exec "tests/demo/helldl$EXEEXT" '(Welcome to .*GNU Hell|unsupported)'
exit $exec_status
Index: tests/demo-inst.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/demo-inst.test,v
retrieving revision 1.16
diff -u -r1.16 demo-inst.test
--- tests/demo-inst.test 25 Mar 2007 12:12:43 -0000 1.16
+++ tests/demo-inst.test 12 Jul 2007 03:04:24 -0000
@@ -31,8 +31,8 @@
func_cd "tests/demo"
func_make "install"
func_exec_init "installed"
-func_exec "$prefix/bin/hell_static" 'Welcome to GNU Hell'
-func_exec "$prefix/bin/hell" 'Welcome to GNU Hell'
-func_exec "$prefix/bin/helldl" '(Welcome to .*GNU Hell|unsupported)'
+func_exec "$prefix/bin/hell_static$EXEEXT" 'Welcome to GNU Hell'
+func_exec "$prefix/bin/hell$EXEEXT" 'Welcome to GNU Hell'
+func_exec "$prefix/bin/helldl$EXEEXT" '(Welcome to .*GNU Hell|unsupported)'
exit $status
Index: tests/demo-relink.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/demo-relink.test,v
retrieving revision 1.9
diff -u -r1.9 demo-relink.test
--- tests/demo-relink.test 25 Mar 2007 12:12:43 -0000 1.9
+++ tests/demo-relink.test 12 Jul 2007 03:04:25 -0000
@@ -57,13 +57,13 @@
hardcode_direct
hardcode_into_libs' "./libtool --config" ": fatal"
-./hell # so that it links on-demand if needed
+./hell$EXEEXT # so that it links on-demand if needed
func_msg "removing libhello.la from demo"
rm -f libhello.la "$objdir"/libhello.*
func_msg "running demo/hell"
-if ./hell; then
+if ./hell$EXEEXT; then
:
elif test "x,$hardcode_action,$hardcode_direct" = x,relink,yes; then
func_msg "Ok, uninstalled programs fail after uninstalled libraries are
removed."
Index: tests/depdemo-exec.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/depdemo-exec.test,v
retrieving revision 1.13
diff -u -r1.13 depdemo-exec.test
--- tests/depdemo-exec.test 25 Mar 2007 12:12:43 -0000 1.13
+++ tests/depdemo-exec.test 12 Jul 2007 03:04:25 -0000
@@ -29,7 +29,7 @@
func_rmprefixdir
func_exec_init "uninstalled"
-func_exec "tests/depdemo/depdemo_static"
-func_exec "tests/depdemo/depdemo"
+func_exec "tests/depdemo/depdemo_static$EXEEXT"
+func_exec "tests/depdemo/depdemo$EXEEXT"
exit $exec_status
Index: tests/depdemo-inst.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/depdemo-inst.test,v
retrieving revision 1.13
diff -u -r1.13 depdemo-inst.test
--- tests/depdemo-inst.test 25 Mar 2007 12:12:43 -0000 1.13
+++ tests/depdemo-inst.test 12 Jul 2007 03:04:25 -0000
@@ -31,7 +31,7 @@
func_cd "tests/depdemo"
func_make "install"
func_exec_init "installed"
-func_exec "$prefix/bin/depdemo_static"
-func_exec "$prefix/bin/depdemo"
+func_exec "$prefix/bin/depdemo_static$EXEEXT"
+func_exec "$prefix/bin/depdemo$EXEEXT"
exit $status
Index: tests/depdemo-relink.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/depdemo-relink.test,v
retrieving revision 1.11
diff -u -r1.11 depdemo-relink.test
--- tests/depdemo-relink.test 25 Mar 2007 12:12:43 -0000 1.11
+++ tests/depdemo-relink.test 12 Jul 2007 03:04:25 -0000
@@ -67,18 +67,18 @@
hardcode_direct
hardcode_into_libs' "./libtool --config" ": fatal"
-./depdemo # so that it links on-demand if needed
+./depdemo$EXEEXT # so that it links on-demand if needed
func_msg "removing libl3.la from depdemo/l3"
rm -rf l3/libl3.la l3/$objdir
func_msg "running depdemo/depdemo"
-if ./depdemo ||
+if ./depdemo$EXEEXT ||
# On AIX 4.1, when the installed copy of libl3 is loaded, it brings
# with it the installed copies of libl1 and libl2, with disjoint
# counters var_l1 and var_l2. This is arguably acceptable behavior,
# but it's definitely not enough of a reason for the test to fail.
- ./depdemo -alt; then
+ ./depdemo$EXEEXT -alt; then
:
elif test "x,$hardcode_action,$hardcode_direct" = x,relink,yes; then
func_msg "Ok, uninstalled programs fail after uninstalled libraries are
removed"
@@ -96,7 +96,7 @@
rm -f l3/libl3.la
func_msg "running depdemo/depdemo with broken libl3.la"
-if (./depdemo) 2>&1; then
+if (./depdemo$EXEEXT) 2>&1; then
func_msg "Exiting: depdemo/depdemo runs even though libl3.la is incomplete"
func_fail "shlibpath_overrides_runpath should be set to no"
elif test "$build" != "$host"; then
Index: tests/f77demo-exec.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/f77demo-exec.test,v
retrieving revision 1.11
diff -u -r1.11 f77demo-exec.test
--- tests/f77demo-exec.test 25 Mar 2007 12:12:43 -0000 1.11
+++ tests/f77demo-exec.test 12 Jul 2007 03:04:25 -0000
@@ -29,7 +29,7 @@
func_rmprefixdir
func_exec_init "uninstalled"
-func_exec "tests/f77demo/fprogram"
-func_exec "tests/f77demo/cprogram"
+func_exec "tests/f77demo/fprogram$EXEEXT"
+func_exec "tests/f77demo/cprogram$EXEEXT"
exit $exec_status
Index: tests/fcdemo-exec.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/fcdemo-exec.test,v
retrieving revision 1.2
diff -u -r1.2 fcdemo-exec.test
--- tests/fcdemo-exec.test 25 Mar 2007 12:12:43 -0000 1.2
+++ tests/fcdemo-exec.test 12 Jul 2007 03:04:25 -0000
@@ -29,7 +29,7 @@
func_rmprefixdir
func_exec_init "uninstalled"
-func_exec "tests/fcdemo/fprogram"
-func_exec "tests/fcdemo/cprogram"
+func_exec "tests/fcdemo/fprogram$EXEEXT"
+func_exec "tests/fcdemo/cprogram$EXEEXT"
exit $exec_status
Index: tests/mdemo-exec.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo-exec.test,v
retrieving revision 1.21
diff -u -r1.21 mdemo-exec.test
--- tests/mdemo-exec.test 25 Mar 2007 12:12:43 -0000 1.21
+++ tests/mdemo-exec.test 12 Jul 2007 03:04:25 -0000
@@ -29,9 +29,9 @@
func_rmprefixdir
func_exec_init "uninstalled"
-func_exec "tests/mdemo/mdemo_static tests/mdemo/foo1.la
tests/mdemo/libfoo2.la" \
+func_exec "tests/mdemo/mdemo_static$EXEEXT tests/mdemo/foo1.la
tests/mdemo/libfoo2.la" \
"try_iterate: .*libfoo2"
-func_exec "tests/mdemo/mdemo tests/mdemo/foo1.la tests/mdemo/libfoo2.la" \
+func_exec "tests/mdemo/mdemo$EXEEXT tests/mdemo/foo1.la
tests/mdemo/libfoo2.la" \
"try_iterate: .*libfoo2"
exit $exec_status
Index: tests/mdemo-inst.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo-inst.test,v
retrieving revision 1.22
diff -u -r1.22 mdemo-inst.test
--- tests/mdemo-inst.test 25 Mar 2007 12:12:43 -0000 1.22
+++ tests/mdemo-inst.test 12 Jul 2007 03:04:25 -0000
@@ -31,7 +31,7 @@
func_cd "tests/mdemo"
func_make "install"
func_exec_init "installed"
-func_exec "$prefix/bin/mdemo_static $prefix/lib/foo1.la $prefix/lib/libfoo2.la"
-func_exec "$prefix/bin/mdemo $prefix/lib/foo1.la $prefix/lib/libfoo2.la"
+func_exec "$prefix/bin/mdemo_static$EXEEXT $prefix/lib/foo1.la
$prefix/lib/libfoo2.la"
+func_exec "$prefix/bin/mdemo$EXEEXT $prefix/lib/foo1.la $prefix/lib/libfoo2.la"
exit $status
Index: tests/mdemo2-exec.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo2-exec.test,v
retrieving revision 1.9
diff -u -r1.9 mdemo2-exec.test
--- tests/mdemo2-exec.test 25 Mar 2007 12:12:43 -0000 1.9
+++ tests/mdemo2-exec.test 12 Jul 2007 03:04:25 -0000
@@ -29,7 +29,7 @@
func_rmprefixdir
func_exec_init "uninstalled"
-func_exec "tests/mdemo2/mdemo2_static tests/mdemo/foo1.la
tests/mdemo/libfoo2.la"
-func_exec "tests/mdemo2/mdemo2 tests/mdemo/foo1.la tests/mdemo/libfoo2.la"
+func_exec "tests/mdemo2/mdemo2_static$EXEEXT tests/mdemo/foo1.la
tests/mdemo/libfoo2.la"
+func_exec "tests/mdemo2/mdemo2$EXEEXT tests/mdemo/foo1.la
tests/mdemo/libfoo2.la"
exit $exec_status
Index: tests/pdemo-exec.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/pdemo-exec.test,v
retrieving revision 1.14
diff -u -r1.14 pdemo-exec.test
--- tests/pdemo-exec.test 25 Mar 2007 12:12:43 -0000 1.14
+++ tests/pdemo-exec.test 12 Jul 2007 03:04:25 -0000
@@ -29,8 +29,8 @@
func_rmprefixdir
func_exec_init "uninstalled"
-func_exec "tests/pdemo/hell_static" 'Welcome to GNU Hell'
-func_exec "tests/pdemo/hell" 'Welcome to GNU Hell'
-func_exec "tests/pdemo/helldl" '(Welcome to .*GNU Hell|unsupported)'
+func_exec "tests/pdemo/hell_static$EXEEXT" 'Welcome to GNU Hell'
+func_exec "tests/pdemo/hell$EXEEXT" 'Welcome to GNU Hell'
+func_exec "tests/pdemo/helldl$EXEEXT" '(Welcome to .*GNU Hell|unsupported)'
exit $exec_status
Index: tests/pdemo-inst.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/pdemo-inst.test,v
retrieving revision 1.15
diff -u -r1.15 pdemo-inst.test
--- tests/pdemo-inst.test 25 Mar 2007 12:12:43 -0000 1.15
+++ tests/pdemo-inst.test 12 Jul 2007 03:04:25 -0000
@@ -31,9 +31,9 @@
func_cd "tests/pdemo"
func_make "install"
func_exec_init "installed"
-func_exec "$prefix/bin/hell_static" 'Welcome to GNU Hell'
-func_exec "$prefix/bin/hell" 'Welcome to GNU Hell'
-func_exec "$prefix/bin/helldl" '(Welcome to .*GNU Hell|unsupported)'
+func_exec "$prefix/bin/hell_static$EXEEXT" 'Welcome to GNU Hell'
+func_exec "$prefix/bin/hell$EXEEXT" 'Welcome to GNU Hell'
+func_exec "$prefix/bin/helldl$EXEEXT" '(Welcome to .*GNU Hell|unsupported)'
exit $status
Index: tests/tagdemo-exec.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/tagdemo-exec.test,v
retrieving revision 1.11
diff -u -r1.11 tagdemo-exec.test
--- tests/tagdemo-exec.test 25 Mar 2007 12:12:43 -0000 1.11
+++ tests/tagdemo-exec.test 12 Jul 2007 03:04:25 -0000
@@ -29,6 +29,6 @@
func_rmprefixdir
func_exec_init "uninstalled"
-func_exec "tests/tagdemo/tagdemo"
+func_exec "tests/tagdemo/tagdemo$EXEEXT"
exit $exec_status
- Followup patch: fix mingw cross-compile regressions,
Charles Wilson <=