LU-3514 tests: combine dependent sanity tests

[fs/lustre-release.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 5bd10be..fd09398 100644 (file)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,9 +2,27 @@
 
 # NOTE: Please avoid bashisms (bash specific syntax) in this script
 
+# die a horrible death.  All output goes to stderr.
+#
+die()
+{
+       echo "bootstrap failure:  $*"
+       echo Aborting
+       exit 1
+} 1>&2
+
+run_cmd()
+{
+       echo -n "Running $*"
+       eval "$@" || die "command exited with code $?"
+       echo
+}
+
 # install Lustre Git commit hooks by default - LU-2083
 for HOOK in commit-msg prepare-commit-msg; do
-       [ -e .git/hooks/$HOOK ] || ln -sf ../../build/$HOOK .git/hooks/
+       if [ -d .git/hooks -a ! -e .git/hooks/$HOOK ]; then
+               ln -sf ../../build/$HOOK .git/hooks/
+       fi
 done
 
 echo "Checking for a complete tree..."
@@ -13,13 +31,10 @@ OPTIONAL_DIRS="snmp portals"
 CONFIGURE_DIRS="libsysio lustre-iokit ldiskfs"
 
 for dir in $REQUIRED_DIRS ; do
-       if [ ! -d "$dir" ] ; then
-               cat >&2 <<EOF
-Your tree seems to be missing $dir.
-Please read README.lustrecvs for details.
-EOF
-               exit 1
-       fi
+       test -d "$dir" || \
+               die "Your tree seems to be missing $dir.
+Please read README.lustrecvs for details."
+
        ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
 done
 # optional directories for Lustre
@@ -29,31 +44,18 @@ for dir in $OPTIONAL_DIRS; do
        fi
 done
 
-run_cmd()
-{
-       cmd="$@"
-       echo -n "Running $cmd"
-       eval $cmd
-       res=$?
-       if [ $res -ne 0 ]; then
-               echo " failed: $res"
-               echo "Aborting"
-               exit 1
-       fi
-       echo
-}
+PWD_SAVE=$PWD
 
 run_cmd "aclocal -I $PWD/config $ACLOCAL_FLAGS"
 run_cmd "autoheader"
 run_cmd "automake -a -c"
 run_cmd autoconf
 
-# Run autogen.sh in these directories
-PWD_SAVE=$PWD
+# bootstrap in these directories
 for dir in $CONFIGURE_DIRS; do
        if [ -d $dir ] ; then
                cd $dir
-               echo "Running autogen for $dir..."
+               echo "bootstrapping in $dir..."
                run_cmd "sh autogen.sh"
        fi
        cd $PWD_SAVE