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

diff --git a/ChangeLog b/ChangeLog
index f89af9ed98de9510745fc1f9e93e4496c05f87df..4c07f490a5d4c81e5fe07a2515d65eff0fa4b2ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2007-07-16  Charles Wilson  <libtool@cwilson.fastmail.fm>
+
+       * 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.
+
 2007-07-14  Peter Rosin  <peda@lysator.liu.se>
 
        * AUTHORS, THANKS: Peter Ekberg got married, now Peter Rosin.

diff --git a/tests/cdemo-exec.test b/tests/cdemo-exec.test
index 3a9ec96062a95d20d55c4246dfd878cfb0600715..dce62f233ef4e6b77647450e65bf6a21503ac0a9 100755 (executable)
--- a/tests/cdemo-exec.test
+++ b/tests/cdemo-exec.test
@@ -29,6 +29,6 @@ func_require "cdemo-make" "tests/cdemo/cdemo$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "tests/cdemo/cdemo"
+func_exec "tests/cdemo/cdemo$EXEEXT"
 
 exit $exec_status

diff --git a/tests/demo-deplibs.test b/tests/demo-deplibs.test
index ac0070ff4c02a5e0525058c6f009a1ed1ce94ba4..2e4c99f8b10f17149272d8ceb5cb083047f0cae4 100755 (executable)
--- a/tests/demo-deplibs.test
+++ b/tests/demo-deplibs.test
@@ -33,6 +33,6 @@ echo "linking a shared library against a static library"
 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

diff --git a/tests/demo-exec.test b/tests/demo-exec.test
index 4ebd0a4881eceab1cd9990a9f914ec3a30b17c8a..b586e9468f6eae165f5025d7c9e93a9fcbb315ba 100755 (executable)
--- a/tests/demo-exec.test
+++ b/tests/demo-exec.test
@@ -29,8 +29,8 @@ func_require "demo-make" "tests/demo/hell$EXEEXT"
 
 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

diff --git a/tests/demo-inst.test b/tests/demo-inst.test
index 26d5b970f0449a0a8519ae11e825537e16020552..3bd5ea6076755aa35766a2d4bd27098d97078847 100755 (executable)
--- a/tests/demo-inst.test
+++ b/tests/demo-inst.test
@@ -31,8 +31,8 @@ func_mkprefixdir
 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

diff --git a/tests/demo-relink.test b/tests/demo-relink.test
index 8786c2489f3bb9dba1eb356e536c848d3c59edb3..8310e46c2da741360e152a79d959b5dfeb23e221 100755 (executable)
--- a/tests/demo-relink.test
+++ b/tests/demo-relink.test
@@ -57,13 +57,13 @@ hardcode_action
 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."

diff --git a/tests/depdemo-exec.test b/tests/depdemo-exec.test
index 42bab83c3e39569ce77653d20f08198cadc12a84..6a6d2708beccb85146173d9c72e20664323e79cf 100755 (executable)
--- a/tests/depdemo-exec.test
+++ b/tests/depdemo-exec.test
@@ -29,7 +29,7 @@ func_require "depdemo-make" "tests/depdemo/depdemo$EXEEXT"
 
 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

diff --git a/tests/depdemo-inst.test b/tests/depdemo-inst.test
index 4a916c436704ebf03afbc202cecc9df98ee929dc..a90b01dbd48efbda3da01da981b19454a34eef66 100755 (executable)
--- a/tests/depdemo-inst.test
+++ b/tests/depdemo-inst.test
@@ -31,7 +31,7 @@ func_mkprefixdir
 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

diff --git a/tests/depdemo-relink.test b/tests/depdemo-relink.test
index 8a12759f060dcd1b1dd3da5f10487d465343674b..dab51b3e187fca1d18a78b0621b3cd65950b06b9 100755 (executable)
--- a/tests/depdemo-relink.test
+++ b/tests/depdemo-relink.test
@@ -67,18 +67,18 @@ hardcode_action
 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 @@ func_msg "linking a broken depdemo/l3/libl3.la"
 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

diff --git a/tests/f77demo-exec.test b/tests/f77demo-exec.test
index 627cb44a9c7f2ed2d84d7f50800427d9826cac2b..40539fd80eaba8ffaefd158be0c78563412419a2 100755 (executable)
--- a/tests/f77demo-exec.test
+++ b/tests/f77demo-exec.test
@@ -29,7 +29,7 @@ func_require "f77demo-make" "tests/f77demo/fprogram$EXEEXT" "tests/f77demo/cprog
 
 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

diff --git a/tests/fcdemo-exec.test b/tests/fcdemo-exec.test
index 3e173ebdaae38f3857e8f9bbce7ce426855622c3..3ee57a89f80975a0b53d759e5829ce08d1517d52 100755 (executable)
--- a/tests/fcdemo-exec.test
+++ b/tests/fcdemo-exec.test
@@ -29,7 +29,7 @@ func_require "fcdemo-make" "tests/fcdemo/fprogram$EXEEXT" "tests/fcdemo/cprogram
 
 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

diff --git a/tests/mdemo-exec.test b/tests/mdemo-exec.test
index 4d7bd0ffdaef3003d1646106186c7611bfe01e7a..bdf221492d2121836f4e9dd89858c82f69341cb4 100755 (executable)
--- a/tests/mdemo-exec.test
+++ b/tests/mdemo-exec.test
@@ -29,9 +29,9 @@ func_require "mdemo-make" "tests/mdemo/mdemo$EXEEXT"
 
 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

diff --git a/tests/mdemo-inst.test b/tests/mdemo-inst.test
index e8fc3a57655fa205d9e4b15d6cb908064b6d7e5c..d611836b3a84bf81eb2f2a3c0a11ae6ea8dddb30 100755 (executable)
--- a/tests/mdemo-inst.test
+++ b/tests/mdemo-inst.test
@@ -31,7 +31,7 @@ func_mkprefixdir
 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

diff --git a/tests/mdemo2-exec.test b/tests/mdemo2-exec.test
index b77b2bcb8908bc2dd4779f7e4898bf48f7855b6f..672df93c9fdc883596dfcb9bec76ea361a083ab4 100755 (executable)
--- a/tests/mdemo2-exec.test
+++ b/tests/mdemo2-exec.test
@@ -29,7 +29,7 @@ func_require "mdemo2-make" "tests/mdemo2/mdemo2$EXEEXT"
 
 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

diff --git a/tests/pdemo-exec.test b/tests/pdemo-exec.test
index 0b43cbaa2e15a451b652b502f644ab45aca7437e..d051ff91a53a25f16ba291cdc3cb2b5471da43b7 100755 (executable)
--- a/tests/pdemo-exec.test
+++ b/tests/pdemo-exec.test
@@ -29,8 +29,8 @@ func_require "pdemo-make" "tests/pdemo/hell$EXEEXT"
 
 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

diff --git a/tests/pdemo-inst.test b/tests/pdemo-inst.test
index cdd7ab366895d0c368bdd8427a34751e43470119..8188b0052ffeeb21d359a3342bfe7c69668abdc8 100755 (executable)
--- a/tests/pdemo-inst.test
+++ b/tests/pdemo-inst.test
@@ -31,9 +31,9 @@ func_mkprefixdir
 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
 

diff --git a/tests/tagdemo-exec.test b/tests/tagdemo-exec.test
index db95c9ab688a77bbd74f0ebb80162470d9ae16c1..6f90109a4dec5994d5ca33c38e6f6b3728133329 100755 (executable)
--- a/tests/tagdemo-exec.test
+++ b/tests/tagdemo-exec.test
@@ -29,6 +29,6 @@ func_require "tagdemo-make" "tests/tagdemo/tagdemo$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "tests/tagdemo/tagdemo"
+func_exec "tests/tagdemo/tagdemo$EXEEXT"
 
 exit $exec_status