* tests/*.test: when a test fails, skip tests that depend on it.

If a certain configuration is not supported, skip all its tests.

diff --git a/ChangeLog b/ChangeLog
index 54eeba8d7140856498c49394efe7d38e8d7d53d3..dfe7536ec850a8b964be1014705cac4b05907888 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-03-19  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * tests/*.test: when a test fails, skip tests that depend on it.
+       If a certain configuration is not supported, skip all its tests.
+
        * doc/libtool.texi: reorder tests to reflect execution order
 
        * tests/noinst-link.test: new test

diff --git a/tests/build-relink.test b/tests/build-relink.test
index 4fc89d67b7118aa5cffd8dba5febc729225f4d7c..03c82e85435d8d8beee7cdc1a400c87ad4177e9d 100755 (executable)
--- a/tests/build-relink.test
+++ b/tests/build-relink.test
@@ -11,15 +11,12 @@ fi
 . $srcdir/defs || exit 1
 
 # Check that things are built.
-if test -f ../demo/hell; then :
+if test -f $prefix/lib/libhello.la && cd ../demo; then :
 else
   echo "You must run demo-inst.test before $0" 1>&2
-  exit 1
+  exit 77
 fi
 
-# Change to our build directory.
-cd ../demo || exit 1
-
 # Unfortunately, we need access to libtool internals for this test.
 objdir=NONE
 eval `egrep -e '^objdir=' ./libtool 2>/dev/null`

diff --git a/tests/cdemo-conf.test b/tests/cdemo-conf.test
index d8c6ee4ea21af27fffa9b386f606eedb88290883..c6d0d161b9e70fc16baade546f5a0ea059d19362 100755 (executable)
--- a/tests/cdemo-conf.test
+++ b/tests/cdemo-conf.test
@@ -27,4 +27,9 @@ rm -f config.cache
 echo "= Configuring in ../cdemo (prefix=$prefix)"
 CONFIG_SITE=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure --srcdir=$srcdir/../cdemo --prefix=$prefix || exit 1
 
+if egrep '^build_old_libs=yes' libtool > /dev/null &&
+   egrep '^build_libtool_libs=yes' libtool > /dev/null; then :
+else rm -f Makefile && exit 77
+fi
+
 exit 0

diff --git a/tests/cdemo-exec.test b/tests/cdemo-exec.test
index e83cb24117f6f31e6daf0cb416f17856198bb73a..b7e5afaf0e466e1ca17bf587af7d0940fa788c2f 100755 (executable)
--- a/tests/cdemo-exec.test
+++ b/tests/cdemo-exec.test
@@ -13,7 +13,7 @@ fi
 if test -f ../cdemo/cdemo; then :
 else
   echo "You must run cdemo-make.test before running $0" 1>&2
-  exit 1
+  exit 77
 fi
 
 # Check to see if the programs really run.

diff --git a/tests/cdemo-make.test b/tests/cdemo-make.test
index 25416b0e4510ac13083366206347b359d91abbf8..7a357000c838e55d5d40fadad14df32c7487159e 100755 (executable)
--- a/tests/cdemo-make.test
+++ b/tests/cdemo-make.test
@@ -13,7 +13,7 @@ fi
 if test -f ../cdemo/Makefile; then :
 else
   echo "You must run cdemo-conf.test before running $0" 1>&2
-  exit 1
+  exit 77
 fi
 
 # Change to our build directory.

diff --git a/tests/cdemo-shared.test b/tests/cdemo-shared.test
index 4d6c15703afd160d3e5c490dcd897b3316869ef0..004baa9ac828060edb88c3a02c3acc98f3eda714 100755 (executable)
--- a/tests/cdemo-shared.test
+++ b/tests/cdemo-shared.test
@@ -27,4 +27,9 @@ rm -f config.cache
 echo "= Configuring in ../cdemo (prefix=$prefix) with --disable-static"
 CONFIG_SITE=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure --srcdir=$srcdir/../cdemo --prefix=$prefix --disable-static || exit 1
 
+if egrep '^build_old_libs=no' libtool > /dev/null &&
+   egrep '^build_libtool_libs=yes' libtool > /dev/null; then :
+else rm -f Makefile && exit 77
+fi
+
 exit 0

diff --git a/tests/cdemo-static.test b/tests/cdemo-static.test
index b5bd232823a7dd75dbb2223e3869c2e99365e2d6..67eca2e24fde23415020e7b0c532e008f4bc6c23 100755 (executable)
--- a/tests/cdemo-static.test
+++ b/tests/cdemo-static.test
@@ -27,4 +27,9 @@ rm -f config.cache
 echo "= Configuring in ../cdemo (prefix=$prefix) with --disable-shared"
 CONFIG_SITE=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure --srcdir=$srcdir/../cdemo --prefix=$prefix --disable-shared || exit 1
 
+if egrep '^build_old_libs=yes' libtool > /dev/null &&
+   egrep '^build_libtool_libs=no' libtool > /dev/null; then :
+else rm -f Makefile && exit 77
+fi
+
 exit 0

diff --git a/tests/demo-conf.test b/tests/demo-conf.test
index 0d0c784a0d5b0c9326a5c92c40e219ef6c8c7683..edb77091c5a037d050cfb775dc3cebb605f41281 100755 (executable)
--- a/tests/demo-conf.test
+++ b/tests/demo-conf.test
@@ -27,4 +27,9 @@ rm -f config.cache
 echo "= Configuring in ../demo (prefix=$prefix)"
 CONFIG_SITE=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix || exit 1
 
+if egrep '^build_old_libs=yes' libtool > /dev/null &&
+   egrep '^build_libtool_libs=yes' libtool > /dev/null; then :
+else rm -f Makefile && exit 77
+fi
+
 exit 0

diff --git a/tests/demo-exec.test b/tests/demo-exec.test
index bdf61bc07b5bfb503db53d350daf23798d823c3f..0980d5a6dd5f5cb04063d6f92f887c567ba786f8 100755 (executable)
--- a/tests/demo-exec.test
+++ b/tests/demo-exec.test
@@ -13,7 +13,7 @@ fi
 if test -f ../demo/hell; then :
 else
   echo "You must run demo-make.test before running $0" 1>&2
-  exit 1
+  exit 77
 fi
 
 # Check to see if the programs really run.

diff --git a/tests/demo-inst.test b/tests/demo-inst.test
index 419cafdfe883ed7e9098bb4d11135a7b7025328c..da47fc5d153c6365c4c8952aecf48701230ac663 100755 (executable)
--- a/tests/demo-inst.test
+++ b/tests/demo-inst.test
@@ -14,7 +14,7 @@ fi
 if test -f ../demo/hell; then :
 else
   echo "You must run demo-make.test before $0" 1>&2
-  exit 1
+  exit 77
 fi
 
 # Change to our build directory.

diff --git a/tests/demo-make.test b/tests/demo-make.test
index ecd3446ca87fdf4b1aea11bb97086feead9ccf2e..8a4a4ba855e9382f5d819983c95cb613d9c15922 100755 (executable)
--- a/tests/demo-make.test
+++ b/tests/demo-make.test
@@ -13,7 +13,7 @@ fi
 if test -f ../demo/Makefile; then :
 else
   echo "You must run demo-conf.test before running $0" 1>&2
-  exit 1
+  exit 77
 fi
 
 # Change to our build directory.

diff --git a/tests/demo-nofast.test b/tests/demo-nofast.test
index e9c89e8b5c4f4c5ae5ff4ff862d0ea42828eede1..0115a81b252919f8e2c28d2aecd8595f0a0666cd 100755 (executable)
--- a/tests/demo-nofast.test
+++ b/tests/demo-nofast.test
@@ -27,4 +27,8 @@ rm -f config.cache
 echo "= Configuring in ../demo (prefix=$prefix)"
 CONFIG_SITE=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --enable-fast-install=no || exit 1
 
+if egrep '^hardcode_action=relink' libtool > /dev/null; then
+  rm -f Makefile && exit 77
+fi
+
 exit 0

diff --git a/tests/demo-shared.test b/tests/demo-shared.test
index 64ced1ffcdeb50cc1fcf30254ca1c8767d9ae43a..d3f3c987e51dab2620539d16ef95271924a6751d 100755 (executable)
--- a/tests/demo-shared.test
+++ b/tests/demo-shared.test
@@ -27,4 +27,9 @@ rm -f config.cache
 echo "= Configuring in ../demo (prefix=$prefix) with --disable-static"
 CONFIG_SITE=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --disable-static || exit 1
 
+if egrep '^build_old_libs=no' libtool > /dev/null &&
+   egrep '^build_libtool_libs=yes' libtool > /dev/null; then :
+else rm -f Makefile && exit 77
+fi
+
 exit 0

diff --git a/tests/demo-static.test b/tests/demo-static.test
index 9508a9e31b011dcfea8e119e393d3a0e2243d58c..f7e01589166525ec25213d3756894a4437723277 100755 (executable)
--- a/tests/demo-static.test
+++ b/tests/demo-static.test
@@ -27,4 +27,9 @@ rm -f config.cache
 echo "= Configuring in ../demo (prefix=$prefix) with --disable-shared"
 CONFIG_SITE=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --disable-shared || exit 1
 
+if egrep '^build_old_libs=yes' libtool > /dev/null &&
+   egrep '^build_libtool_libs=no' libtool > /dev/null; then :
+else rm -f Makefile && exit 77
+fi
+
 exit 0

diff --git a/tests/demo-unst.test b/tests/demo-unst.test
index 65859f6aa44b242dcfce6c97aa11db46a154d33d..7928f5f80df85536cdd467df8d4fc068560f630f 100755 (executable)
--- a/tests/demo-unst.test
+++ b/tests/demo-unst.test
@@ -10,11 +10,11 @@ if test -z "$srcdir"; then
 fi
 . $srcdir/defs || exit 1
 
-# Maybe we have a VPATH build, in which case, create a new subdir.
+# Make sure it was installed already
 if test "$prefix/bin/hell"; then :
 else
   echo "You must run demo-inst.test before $0." 1>&2
-  exit 1
+  exit 77
 fi
 
 # Change to our build directory.

diff --git a/tests/hardcode.test b/tests/hardcode.test
index 3e6c7670c3a2d43899a02817c44251759f6d1bde..d780ab61207dc284ccbf741782e29e7170b54189 100755 (executable)
--- a/tests/hardcode.test
+++ b/tests/hardcode.test
@@ -2,7 +2,7 @@
 # hardcode.test - check to see what the system linker hardcodes
 
 # Test script header.
-need_prefix=yes # otherwise it will be removed, and build-relink fails
+need_prefix=yes
 if test -z "$srcdir"; then
   srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
   test "$srcdir" = "$0" && srcdir=.
@@ -11,15 +11,12 @@ fi
 . $srcdir/defs || exit 1
 
 # Check that things are built.
-if test -f ../demo/hell; then :
+if test -f $prefix/lib/libhello.la && cd ../demo; then :
 else
-  echo "You must run demo-make.test before $0" 1>&2
-  exit 1
+  echo "You must run demo-inst.test before $0" 1>&2
+  exit 77
 fi
 
-# Change to our build directory.
-cd ../demo || exit 1
-
 # Unfortunately, we need access to libtool internals for this test.
 objdir=NONE
 eval `egrep -e '^objdir=' ./libtool 2>/dev/null`

diff --git a/tests/mdemo-conf.test b/tests/mdemo-conf.test
index d74b13563b201945419fa925b68f27a86042a73c..aa05fed831ae4345dc0c1724e7d3a0ba37f6f679 100755 (executable)
--- a/tests/mdemo-conf.test
+++ b/tests/mdemo-conf.test
@@ -27,4 +27,9 @@ rm -f config.cache
 echo "= Configuring in ../mdemo (prefix=$prefix)"
 CONFIG_SITE=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure --srcdir=$srcdir/../mdemo --prefix=$prefix || exit 1
 
+if egrep '^build_old_libs=yes' libtool > /dev/null &&
+   egrep '^build_libtool_libs=yes' libtool > /dev/null; then :
+else rm -f Makefile && exit 77
+fi
+
 exit 0

diff --git a/tests/mdemo-exec.test b/tests/mdemo-exec.test
index a7d241e42b54c848aa6107a65bd921b72e1c3a4b..037c0bd15d81ad1744be64d1db9c9ce0307c8d44 100755 (executable)
--- a/tests/mdemo-exec.test
+++ b/tests/mdemo-exec.test
@@ -13,7 +13,7 @@ fi
 if test -f ../mdemo/mdemo; then :
 else
   echo "You must run mdemo-make.test before running $0" 1>&2
-  exit 1
+  exit 77
 fi
 
 # Check to see if the programs really run.

diff --git a/tests/mdemo-inst.test b/tests/mdemo-inst.test
index fcd4025dfe1f6e39e160cef957438efabed97ed1..d0a748ab9d0e9889b6121eee5d3a65cfe170665c 100755 (executable)
--- a/tests/mdemo-inst.test
+++ b/tests/mdemo-inst.test
@@ -14,7 +14,7 @@ fi
 if test -f ../mdemo/mdemo; then :
 else
   echo "You must run mdemo-make.test before $0" 1>&2
-  exit 1
+  exit 77
 fi
 
 # Change to our build directory.

diff --git a/tests/mdemo-make.test b/tests/mdemo-make.test
index d530d0af265bf13a0e6fc24b7342239ee1290625..c54b907fc7e1984f3758da620bc18209993da2cc 100755 (executable)
--- a/tests/mdemo-make.test
+++ b/tests/mdemo-make.test
@@ -13,7 +13,7 @@ fi
 if test -f ../mdemo/Makefile; then :
 else
   echo "You must run mdemo-conf.test before running $0" 1>&2
-  exit 1
+  exit 77
 fi
 
 # Change to our build directory.

diff --git a/tests/mdemo-shared.test b/tests/mdemo-shared.test
index 9f1d3a557eba645cb31e6ec0f32a670781c91ef7..3cbc2ffb3688a4d1596ba4e1399aede5b2cb401d 100755 (executable)
--- a/tests/mdemo-shared.test
+++ b/tests/mdemo-shared.test
@@ -27,4 +27,9 @@ rm -f config.cache
 echo "= Configuring in ../mdemo (prefix=$prefix) with --disable-static"
 CONFIG_SITE=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure --srcdir=$srcdir/../mdemo --prefix=$prefix --disable-static || exit 1
 
+if egrep '^build_old_libs=no' libtool > /dev/null &&
+   egrep '^build_libtool_libs=yes' libtool > /dev/null; then :
+else rm -f Makefile && exit 77
+fi
+
 exit 0

diff --git a/tests/mdemo-static.test b/tests/mdemo-static.test
index b6ecb5ec34f5ddec0fd827464a361a2c4531be48..c6f5562f486198f0f8be127ad49b37e9236c4a2e 100755 (executable)
--- a/tests/mdemo-static.test
+++ b/tests/mdemo-static.test
@@ -27,4 +27,9 @@ rm -f config.cache
 echo "= Configuring in ../mdemo (prefix=$prefix) with --disable-shared"
 CONFIG_SITE=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure --srcdir=$srcdir/../mdemo --prefix=$prefix --disable-shared || exit 1
 
+if egrep '^build_old_libs=yes' libtool > /dev/null &&
+   egrep '^build_libtool_libs=no' libtool > /dev/null; then :
+else rm -f Makefile && exit 77
+fi
+
 exit 0

diff --git a/tests/mdemo-unst.test b/tests/mdemo-unst.test
index 77c5d0ac0eab9fa0648d43c532044c0e337dfd6b..3539ea0fe2df85075732f0a95465fc1fe819cffe 100755 (executable)
--- a/tests/mdemo-unst.test
+++ b/tests/mdemo-unst.test
@@ -10,11 +10,11 @@ if test -z "$srcdir"; then
 fi
 . $srcdir/defs || exit 1
 
-# Maybe we have a VPATH build, in which case, create a new subdir.
+# Make sure it was installed already
 if test "$prefix/bin/hell"; then :
 else
   echo "You must run mdemo-inst.test before $0." 1>&2
-  exit 1
+  exit 77
 fi
 
 # Change to our build directory.