From 083b9443f398c5ccd85e28d69591847b2f69e03b Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Sun, 21 Mar 1999 04:51:36 +0000 Subject: [PATCH] * tests/*-unst.test: if directory is not configured, skip it * tests/demo.test, tests/mdemo.test: unused, removed * tests/depdemo.test: ditto --- ChangeLog | 8 +++-- tests/demo-unst.test | 5 +-- tests/demo.test | 80 ----------------------------------------- tests/depdemo-unst.test | 2 +- tests/depdemo.test | 80 ----------------------------------------- tests/mdemo-unst.test | 5 +-- tests/mdemo.test | 80 ----------------------------------------- 7 files changed, 9 insertions(+), 251 deletions(-) delete mode 100644 tests/demo.test delete mode 100644 tests/depdemo.test delete mode 100644 tests/mdemo.test diff --git a/ChangeLog b/ChangeLog index 3d6a93d6e..f7b9a5380 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-03-21 Alexandre Oliva + + * tests/*-unst.test: if directory is not configured, skip it + * tests/demo.test, tests/mdemo.test: unused, removed + * tests/depdemo.test: ditto + 1999-03-20 Thomas Tanner * doc/libtool.texi (link mode): documentation for -module updated @@ -53,8 +59,6 @@ (*, hardcode_direct, hardcode_minus_L): remove entries that set them to no, that is default -1999-03-19 Alexandre Oliva - * demo/Makefile.am (hc-direct, hc-libpath, hc-minusL): link with $$hardcode_libdir_flag_spec, if available, with libdir=$(libdir), to make sure the hardcode_* variables will produce the expected diff --git a/tests/demo-unst.test b/tests/demo-unst.test index 7928f5f80..172c19b1a 100755 --- a/tests/demo-unst.test +++ b/tests/demo-unst.test @@ -11,15 +11,12 @@ fi . $srcdir/defs || exit 1 # Make sure it was installed already -if test "$prefix/bin/hell"; then : +if test "$prefix/bin/hell" && cd ../demo && test -f Makefile; then : else echo "You must run demo-inst.test before $0." 1>&2 exit 77 fi -# Change to our build directory. -cd ../demo || exit 1 - echo "= Running $make uninstall in ../demo" $make uninstall || exit 1 diff --git a/tests/demo.test b/tests/demo.test deleted file mode 100644 index 072cb6809..000000000 --- a/tests/demo.test +++ /dev/null @@ -1,80 +0,0 @@ -#! /bin/sh -# demo.test - try building in the ../demo subdirectory - -# Test script header. -need_prefix=yes -if test -z "$srcdir"; then - srcdir=. - test "${VERBOSE+set}" != "set" && VERBOSE=yes -fi -. $srcdir/defs || exit 1 - -# Maybe we have a VPATH build, in which case, create a new subdir. -test -d ../demo || mkdir ../demo - -# Change to our build directory. -cd ../demo || exit 1 - -# Possibly clean up the distribution. -if test -f config.cache; then - echo "= Running make distclean in ../demo" - make distclean || rm -f config.cache -fi - -# Configure the demonstration. -echo "= Configuring in ../demo (prefix=$prefix)" -$srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix || exit 1 - -# Do the actual build. -echo "= Running make in ../demo" -make || exit 1 - -# Try running the program. -echo "= Executing uninstalled programs" -if ./hell.static | grep 'GNU Hell'; then : -else - echo "$0: cannot execute ./hell.static" 1>&2 - exit 1 -fi - -if ./hell | grep 'GNU Hell'; then : -else - echo "$0: cannot execute ./hell" 1>&2 - exit 1 -fi - -echo "= Running make install in ../demo" -make install || exit 1 - -echo "= Executing installed programs" -if $prefix/bin/hell.static | grep 'GNU Hell'; then : -else - echo "$0: cannot execute $prefix/bin/hell.static" 1>&2 - exit 1 -fi - -if $prefix/bin/hell | grep 'GNU Hell'; then : -else - echo "$0: cannot execute $prefix/bin/hell" 1>&2 - exit 1 -fi - -echo "= Running make uninstall in ../demo" -make uninstall || exit 1 - -# See that there were no files leftover in $prefix. -leftovers=`find $prefix ! -type d -print` -if test -n "$leftovers"; then - echo "= Leftover after make uninstall:" - ls -l $leftovers - exit 1 -fi - -# Delete the directory tree we created. -rm -rf $prefix - - -# Clean up the distribution. -make distclean - -exit 0 diff --git a/tests/depdemo-unst.test b/tests/depdemo-unst.test index aaf87bd10..5befeb8a3 100755 --- a/tests/depdemo-unst.test +++ b/tests/depdemo-unst.test @@ -11,7 +11,7 @@ fi . $srcdir/defs || exit 1 # Make sure it was installed already -if test "$prefix/bin/hell" && cd ../depdemo; then : +if test "$prefix/bin/hell" && cd ../depdemo && test -f Makefile; then : else echo "You must run depdemo-inst.test before $0." 1>&2 exit 77 diff --git a/tests/depdemo.test b/tests/depdemo.test deleted file mode 100644 index a71038393..000000000 --- a/tests/depdemo.test +++ /dev/null @@ -1,80 +0,0 @@ -#! /bin/sh -# depdemo.test - try building in the ../depdemo subdirectory - -# Test script header. -need_prefix=yes -if test -z "$srcdir"; then - srcdir=. - test "${VERBOSE+set}" != "set" && VERBOSE=yes -fi -. $srcdir/defs || exit 1 - -# Maybe we have a VPATH build, in which case, create a new subdir. -test -d ../depdemo || mkdir ../depdemo - -# Change to our build directory. -cd ../depdemo || exit 1 - -# Possibly clean up the distribution. -if test -f config.cache; then - echo "= Running make distclean in ../depdemo" - make distclean || rm -f config.cache -fi - -# Configure the demonstration. -echo "= Configuring in ../depdemo (prefix=$prefix)" -$srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix || exit 1 - -# Do the actual build. -echo "= Running make in ../depdemo" -make || exit 1 - -# Try running the program. -echo "= Executing uninstalled programs" -if ./depdemo.static; then : -else - echo "$0: cannot execute ./depdemo.static" 1>&2 - exit 1 -fi - -if ./depdemo; then : -else - echo "$0: cannot execute ./depdemo" 1>&2 - exit 1 -fi - -echo "= Running make install in ../depdemo" -make install || exit 1 - -echo "= Executing installed programs" -if $prefix/bin/depdemo.static; then : -else - echo "$0: cannot execute $prefix/bin/depdemo.static" 1>&2 - exit 1 -fi - -if $prefix/bin/depdemo; then : -else - echo "$0: cannot execute $prefix/bin/depdemo" 1>&2 - exit 1 -fi - -echo "= Running make uninstall in ../depdemo" -make uninstall || exit 1 - -# See that there were no files leftover in $prefix. -leftovers=`find $prefix ! -type d -print` -if test -n "$leftovers"; then - echo "= Leftover after make uninstall:" - ls -l $leftovers - exit 1 -fi - -# Delete the directory tree we created. -rm -rf $prefix - - -# Clean up the distribution. -make distclean - -exit 0 diff --git a/tests/mdemo-unst.test b/tests/mdemo-unst.test index 3539ea0fe..2ffe4f9f1 100755 --- a/tests/mdemo-unst.test +++ b/tests/mdemo-unst.test @@ -11,15 +11,12 @@ fi . $srcdir/defs || exit 1 # Make sure it was installed already -if test "$prefix/bin/hell"; then : +if test "$prefix/bin/hell" && cd ../mdemo && test -f Makefile; then : else echo "You must run mdemo-inst.test before $0." 1>&2 exit 77 fi -# Change to our build directory. -cd ../mdemo || exit 1 - echo "= Running $make uninstall in ../mdemo" $make uninstall || exit 1 diff --git a/tests/mdemo.test b/tests/mdemo.test deleted file mode 100644 index 9af96cef7..000000000 --- a/tests/mdemo.test +++ /dev/null @@ -1,80 +0,0 @@ -#! /bin/sh -# mdemo.test - try building in the ../mdemo subdirectory - -# Test script header. -need_prefix=yes -if test -z "$srcdir"; then - srcdir=. - test "${VERBOSE+set}" != "set" && VERBOSE=yes -fi -. $srcdir/defs || exit 1 - -# Maybe we have a VPATH build, in which case, create a new subdir. -test -d ../mdemo || mkdir ../mdemo - -# Change to our build directory. -cd ../mdemo || exit 1 - -# Possibly clean up the distribution. -if test -f config.cache; then - echo "= Running make distclean in ../mdemo" - make distclean || rm -f config.cache -fi - -# Configure the demonstration. -echo "= Configuring in ../mdemo (prefix=$prefix)" -$srcdir/../mdemo/configure --srcdir=$srcdir/../mdemo --prefix=$prefix || exit 1 - -# Do the actual build. -echo "= Running make in ../mdemo" -make || exit 1 - -# Try running the program. -echo "= Executing uninstalled programs" -if ./mdemo.static foo1.la libfoo2.la; then : -else - echo "$0: cannot execute ./mdemo.static" 1>&2 - exit 1 -fi - -if ./mdemo foo1.la libfoo2.la; then : -else - echo "$0: cannot execute ./mdemo" 1>&2 - exit 1 -fi - -echo "= Running make install in ../mdemo" -make install || exit 1 - -echo "= Executing installed programs" -if $prefix/bin/mdemo.static $prefix/lib/foo1.la $prefix/lib/libfoo2.la; then : -else - echo "$0: cannot execute $prefix/bin/mdemo.static" 1>&2 - exit 1 -fi - -if $prefix/bin/mdemo $prefix/lib/foo1.la $prefix/lib/libfoo2.la; then : -else - echo "$0: cannot execute $prefix/bin/mdemo" 1>&2 - exit 1 -fi - -echo "= Running make uninstall in ../mdemo" -make uninstall || exit 1 - -# See that there were no files leftover in $prefix. -leftovers=`find $prefix ! -type d -print` -if test -n "$leftovers"; then - echo "= Leftover after make uninstall:" - ls -l $leftovers - exit 1 -fi - -# Delete the directory tree we created. -rm -rf $prefix - - -# Clean up the distribution. -make distclean - -exit 0 -- 2.47.3