* tests/*-unst.test: if directory is not configured, skip it

* tests/demo.test, tests/mdemo.test: unused, removed

diff --git a/ChangeLog b/ChangeLog
index 3cd1451f544509b4ebf82fea6d8ebe0bbd10db28..18d2dfc27bf2a8acb7931378c512e25e6246fdbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-03-21  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * tests/*-unst.test: if directory is not configured, skip it
+       * tests/demo.test, tests/mdemo.test: unused, removed
+
 1999-03-20 Thomas Tanner  <tanner@gmx.de>
 
        * use the same header in all configure.in's and Makefile.am's

diff --git a/tests/demo-unst.test b/tests/demo-unst.test
index 7928f5f80df85536cdd467df8d4fc068560f630f..172c19b1a9d10c6f3c445ee55fbe524b3de9236d 100755 (executable)
--- 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 (file)
index 072cb68..0000000
--- 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/mdemo-unst.test b/tests/mdemo-unst.test
index 3539ea0fe2df85075732f0a95465fc1fe819cffe..2ffe4f9f1f1d63ae6f3a49af47bf813c22383fc6 100755 (executable)
--- 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 (file)
index 9af96ce..0000000
--- 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