Commit 4607489a authored by Andrea Sciaba's avatar Andrea Sciaba
Browse files

Minor cleanup

parent 6e6c7057
......@@ -8,7 +8,6 @@ warn=0
cat $SAME_SENSOR_HOME/tests/CMS-SAM-Banner.html
echo "<pre>"
echo "version 23-9 17:00"
set -x
uname -a
cat /etc/issue
......@@ -30,10 +29,6 @@ else
echo "ERROR: Neither VO_CMS_SW_DIR nor OSG_APP defined"
exit $SAME_ERROR
fi
#if [ `uname -n|cut -d. -f2-` == "cern.ch" ] ; then
# echo "running at CERN, hardset \$SW_DIR to /afs/cern.ch/cms/sw"
# export SW_DIR=/afs/cern.ch/cms/sw/
#fi
echo "CMS software location SW_DIR=" $SW_DIR
tmpfile=`mktemp /tmp/tmp.XXXXXXXXXX`
......@@ -63,7 +58,7 @@ if ! [ $slVersion == "slc5" ] ; then
fi
if [ $libc25 == "0" ] ; then
echo "<h2>ohibo' ! SL5 but no libc-2.5</h2>"
echo "<h2>WARNING! SL5 but no libc-2.5</h2>"
echo "osVersion/slVersion =" $osVersion $slVersion
echo "ls -l /lib/libc*"
ls -l /lib/libc*
......@@ -96,7 +91,6 @@ fi
# Execute main test scripts
echo "<h3>Test analysis of data from /store/data </h3>"
echo "<pre>"
echo " SAME_SENSOR_HOME: " $SAME_SENSOR_HOME
echo "Running $SAME_SENSOR_HOME/tests/AnalysisTest.sh 2>&1"
AnalysisTestWorkDir=`mktemp -d AnalysisTestWorkDir.XXXXXXXXXX`
pushd . > /dev/null
......@@ -116,26 +110,10 @@ if [ $result == $SAME_ERROR ] ; then
err=1
fi
#echo "<h3>Test analysis of data from /store/user </h3>"
#echo "<pre>"
#echo " SAME_SENSOR_HOME: " $SAME_SENSOR_HOME
#echo "Running $SAME_SENSOR_HOME/tests/AnalysisTestUser.sh 2>&1"
#AnalysisTestUserWorkDir=`mktemp -d AnalysisTestUserWorkDir.XXXXXXXXXX`
#pushd . > /dev/null
#cd $AnalysisTestUserWorkDir
#pwd
#$SAME_SENSOR_HOME/tests/AnalysisTestUser.sh 2>&1
#result=$?
#echo "</pre>"
#popd > /dev/null
if [ $result != $SAME_OK ] ; then
warn=1
fi
if [ $err == 1 ] ; then
exit $SAME_ERROR
fi
......@@ -144,5 +122,4 @@ if [ $warn == 1 ] ; then
exit $SAME_WARNING
fi
exit $SAME_OK
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment