Commit 753f638c authored by Andrea Sciaba's avatar Andrea Sciaba
Browse files

Made samtest-run compliant

parent c177713d
......@@ -33,7 +33,6 @@ else
echo "ERROR: Neither VO_CMS_SW_DIR nor OSG_APP defined"
echo "<br />"
echo "summary: SW_DIR_UNDEF"
echo "</p>"
exit $SAME_ERROR
fi
ls -ld $SW_DIR
......@@ -46,7 +45,6 @@ if [ $result != 0 ]
echo "ERROR: software directory non existent or non readable"
echo "<br />"
echo "summary: NO_SW_DIR"
echo "</p>"
exit $SAME_ERROR
fi
......@@ -55,7 +53,6 @@ if [ ! -f $SW_DIR/cmsset_default.sh ] ; then
echo "ERROR: cmssw setup file $SW_DIR/cmsset_default.sh not existing"
echo "<br />"
echo "summary: NO_SETUP_SCRIPT"
echo "</p>"
exit $SAME_ERROR
fi
......@@ -72,7 +69,6 @@ if [ $result != 0 ]
echo "ERROR: CMS software initialisation script cmsset_default.sh failed"
echo "<br />"
echo "summary: NO_SETUP_SCRIPT"
echo "</p>"
exit $SAME_ERROR
else
echo "<p>OK</p>"
......@@ -87,7 +83,6 @@ if [ -z $CMS_PATH ]; then
echo "ERROR: CMS_PATH not defined"
echo "<br />"
echo "summary: CMS_PATH_UNDEF"
echo "</p>"
exit $SAME_ERROR
fi
......@@ -96,7 +91,6 @@ if [ ! -d $CMS_PATH ] ; then
echo "ERROR: CMS_PATH directory $CMS_PATH not existing"
echo "<br />"
echo "summary: NO_CMS_PATH"
echo "</p>"
exit $SAME_ERROR
fi
......@@ -105,7 +99,6 @@ if [ ! -d $CMS_PATH/SITECONF/local/JobConfig ] ; then
echo "ERROR: JobConfig directory $CMS_PATH/SITECONF/local/JobConfig not existing"
echo "<br />"
echo "summary: NO_JOBCONFIG_DIR"
echo "</p>"
exit $SAME_ERROR
fi
......@@ -123,7 +116,6 @@ if [ ! -f $ConfigFile ] ; then
echo "ERROR: Local Configuration file site-local-config.xml not existing"
echo "<br />"
echo "summary: NO_SITELOCALCONFIG"
echo "</p>"
exit $SAME_ERROR
fi
......@@ -178,7 +170,7 @@ fi
if [ $error == 1 ] ; then
echo "<p>ERROR: invalid local configuration file $ConfigFile<br />"
echo $errorSummary
echo "</p>"
exit $SAME_ERROR
fi
echo "<h2>Compare local configuration file and TFC with CVS</h2>"
......@@ -387,7 +379,7 @@ if [ $rc == 0 ] ; then
srmcpVersion=`srmcp -version 2>&1|egrep "Client version"|awk '{print $(NF)'}`
srmcpV1=`echo $srmcpVersion|cut -d. -f1`
srmcpV2=`echo $srmcpVersion|cut -d. -f2`
if [ $srmcpV1 -ge 2 ] ; then
if [ -n "$srmcpV1" -a $srmcpV1 -ge 2 ] ; then
stageOutError=0
fi
fi
......@@ -440,8 +432,10 @@ fi
if [ $info == 1 ]
then
echo "<p>INFO</p>"
echo "summary: OK"
exit $SAME_OK
fi
echo "<p>OK</p>"
echo "summary: OK"
exit $SAME_OK
Markdown is supported
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