Reorganized autotest.sh in preparation for new tests to be added.

Removed the commented out environment variable stuff in the machine* files.
This commit is contained in:
falgout 2007-12-06 22:55:23 +00:00
parent a7da0d92b8
commit de95ee91c2
4 changed files with 38 additions and 95 deletions

View File

@ -30,11 +30,11 @@ testing_dir=`cd ..; pwd`
autotest_dir="$testing_dir/AUTOTEST"
finished_dir="$testing_dir/AUTOTEST-FINISHED"
output_dir="$testing_dir/AUTOTEST-`date +%Y.%m.%d-%a`"
cvs_opts=""
src_dir="$testing_dir/linear_solvers"
cvs_opts=""
summary_file="SUMMARY.html"
summary_subject="NEW Autotest Error Summary `date +%D`"
email_list="rfalgout@llnl.gov, tzanio@llnl.gov"
email_list="rfalgout@llnl.gov"
# email_list="rfalgout@llnl.gov, tzanio@llnl.gov, umyang@llnl.gov, abaker@llnl.gov, lee123@llnl.gov, chtong@llnl.gov, panayot@llnl.gov"
# Ensure that important directories exist
@ -44,6 +44,7 @@ mkdir -p $finished_dir
cd $autotest_dir
# Main loop
test_opts=""
while [ "$*" ]
do
case $1 in
@ -74,6 +75,7 @@ do
EOF
exit
;;
-t|-trace)
set -xv
shift
@ -85,54 +87,10 @@ EOF
rm -fr linear_solvers
cvs -d /home/casc/repository checkout $cvs_opts linear_solvers
cp -fR linear_solvers/AUTOTEST .
test_opts=""
break
;;
# Run local tests
-tux*)
if [ ! -e autotest-tux-start ]; then
host=`echo $1 | awk -F- '{print $2}'`
echo "Test [machine-tux] started at `date +%T` on `date +%D`" \
>> autotest-tux-start
./testsrc.sh $src_dir $host:hypre/testing/$host machine-tux.sh
echo "Test [machine-tux] finished at `date +%T` on `date +%D`" \
>> autotest-tux-start
mv machine-tux.??? $finished_dir
touch autotest-tux-done
fi
shift
;;
# Run remote tests
-alc|-thunder|-up|-zeus)
if [ ! -e autotest$1-start ]; then
host=`echo $1 | awk -F- '{print $2}'`
echo "Test [machine-$host] started at `date +%T` on `date +%D`" \
>> autotest-$host-start
./testsrc.sh $src_dir $host:hypre/testing/$host machine-$host.sh
echo "Test [machine-$host] finished at `date +%T` on `date +%D`" \
>> autotest-$host-start
mv machine-$host.??? $finished_dir
touch autotest-$host-done
fi
shift
;;
# Run tests on a Mac
-mac)
if [ ! -e autotest-mac-start ]; then
host="kolev-mac"
echo "Test [machine-mac] started at `date +%T` on `date +%D`" \
>> autotest-mac-start
./testsrc.sh $src_dir $host:hypre/testing/$host machine-mac.sh
echo "Test [machine-mac] finished at `date +%T` on `date +%D`" \
>> autotest-mac-start
mv machine-mac.??? $finished_dir
touch autotest-mac-done
fi
shift
;;
# Generate a summary file in the output directory
-summary)
# move the finished logs to todays output directory
@ -209,15 +167,48 @@ EOF
) | /usr/sbin/sendmail -t
test_opts=""
break
;;
*)
test_opts="$test_opts $1"
shift
;;
esac
done
# Run tests
for opt in $test_opts
do
case $opt in
-tux*)
host=`echo $opt | awk -F- '{print $2}'`
name="tux"
;;
-alc|-thunder|-up|-zeus)
host=`echo $opt | awk -F- '{print $2}'`
name=$host
;;
-mac)
host="kolev-mac"
name="mac"
;;
esac
if [ ! -e autotest-$name-start ]; then
echo "Test [machine-$name] started at `date +%T` on `date +%D`" \
>> autotest-$name-start
./testsrc.sh $src_dir $host:hypre/testing/$host machine-$name.sh
echo "Test [machine-$name] finished at `date +%T` on `date +%D`" \
>> autotest-$name-start
mv machine-$name.??? $finished_dir
touch autotest-$name-done
fi
done
# Fix permissions
cd $testing_dir
ch_dirs="linear_solvers $autotest_dir $finished_dir"

View File

@ -87,12 +87,3 @@ for errfile in $( find $output_dir ! -size 0 -name "*.err" )
do
echo $errfile >&2
done
# Set some environment variables
# PATH=/usr/local/KAI/KCC_BASE/bin:$PATH
# PATH=/usr/local/mpi/bin:/opt/intel/compiler90/bin:$PATH
# export PATH
# LD_LIBRARY_PATH=/opt/intel/compiler90/lib:$LD_LIBRARY_PATH
# export LD_LIBRARY_PATH
# LM_LICENSE_FILE="/usr/local/etc/license.client"
# export LM_LICENSE_FILE

View File

@ -97,17 +97,3 @@ for errfile in $( find $output_dir ! -size 0 -name "*.err" )
do
echo $errfile >&2
done
# Set some environment variables
# MPICH=/usr/apps/mpich/default/bin:/usr/apps/mpich/1.2.7p1/bin
# P4_RSHCOMMAND=/usr/apps/mpich/default/bin/ssh-nobanner
# P4_RSHCOMMAND=/usr/apps/mpich/1.2.7p1/bin/ssh-nobanner
# export P4_RSHCOMMAND
# PARASOFT=/usr/apps/ParaSoft/insure++7.1.0
# PARASOFT=/usr/apps/insure++/default
# export PARASOFT
# PATH=$MPICH:$PARASOFT/bin:/usr/local/bin:$PATH
# LATEX2HTML=/usr/apps/latex2html/default
# DOCPP=$HOME/local
# PATH=$LATEX2HTML/bin:$PATH:$DOCPP/bin
# export PATH

View File

@ -87,28 +87,3 @@ for errfile in $( find $output_dir ! -size 0 -name "*.err" )
do
echo $errfile >&2
done
# Set some environment variables
# PATH=/usr/local/tools/KCC/kcc4.0f18/KCC_BASE/bin
# PATH=$PATH:/usr/local/tools/guide.assure/guide40.31/bin:/usr/java130/bin
# PATH=$PATH:/usr/local/bin:/usr/bin:/usr/sbin:/usr/ucb
# PATH=$PATH:/usr/bin/X11:/usr/local/totalview/bin:/usr/local/gnu/bin
# PATH=$PATH:/usr/local/scripts:/usr/apps/bin
# PATH=/opt/freeware/bin:$PATH
# PATH=$PATH:.
# export PATH
# LD_LIBRARY_PATH=`pwd`/../hypre/lib
# export LD_LIBRARY_PATH
# MP_RMPOOL=0
# MP_CPU_USE=unique
# MP_EUIDEVICE=css0
# MP_EUILIB=us
# MP_RESD=yes
# MP_HOSTFILE=NULL
# MP_LABELIO=yes
# MP_INFOLEVEL=1
# MP_RETRY=60
# MP_RETRYCOUNT=10
# export MP_RMPOOL MP_CPU_USE MP_EUIDEVICE MP_EUILIB MP_RESD
# export MP_HOSTFILE MP_LABELIO MP_INFOLEVEL
# export MP_RETRY MP_RETRYCOUNT