Commit 050dfa28 authored by Andrea Sciaba's avatar Andrea Sciaba
Browse files

Suppression of output of sourcing CMS environment

parent 61ea8514
...@@ -2,10 +2,12 @@ ...@@ -2,10 +2,12 @@
echo "<h2>Test of the local FroNtier squid</h2>" echo "<h2>Test of the local FroNtier squid</h2>"
echo "<pre>"
set -x set -x
uname -a uname -a
date date
set +x set +x
echo "</pre>"
# Source the CMS environment # Source the CMS environment
echo "<h3>Sourcing the CMS environment</h3>" echo "<h3>Sourcing the CMS environment</h3>"
...@@ -15,33 +17,34 @@ if [ -n "$VO_CMS_SW_DIR" ] ; then ...@@ -15,33 +17,34 @@ if [ -n "$VO_CMS_SW_DIR" ] ; then
elif [ -n "$OSG_APP" ] ; then elif [ -n "$OSG_APP" ] ; then
SW_DIR=$OSG_APP/cmssoft/cms SW_DIR=$OSG_APP/cmssoft/cms
else else
echo "ERROR: Neither VO_CMS_SW_DIR nor OSG_APP defined" echo "<p>ERROR: Neither VO_CMS_SW_DIR nor OSG_APP defined</p>"
exit $SAME_ERROR exit $SAME_ERROR
fi fi
tmpfile=`mktemp /tmp/tmp.XXXXXXXXXX` tmpfile=`mktemp /tmp/tmp.XXXXXXXXXX`
echo "<pre>" echo "<pre>"
source $SW_DIR/cmsset_default.sh > $tmpfile 2>&1 source $SW_DIR/cmsset_default.sh > $tmpfile 2>&1
result=$? result=$?
cat $tmpfile #cat $tmpfile
echo "</pre>" echo "</pre>"
grep 'Your shell is not able to find' $tmpfile > /dev/null grep 'Your shell is not able to find' $tmpfile > /dev/null
result2=$? result2=$?
rm -f $tmpfile rm -f $tmpfile
if [ $result != 0 ] if [ $result != 0 ]
then then
echo "ERROR: $SW_DIR/cmsset_default.sh non existent or non readable" echo "<p>ERROR: $SW_DIR/cmsset_default.sh non existent or non readable</p>"
exit $SAME_ERROR exit $SAME_ERROR
fi fi
if [ $result2 == 0 ] if [ $result2 == 0 ]
then then
echo "ERROR: $SW_DIR/cmsset_default.sh failed" echo "<p>ERROR: $SW_DIR/cmsset_default.sh failed</p>"
exit $SAME_ERROR exit $SAME_ERROR
fi fi
# Execute main test script # Execute main test script
echo "<h3>Executing the squid test</h3>" echo "<h3>Executing the squid test</h3>"
echo "<pre>" echo "<pre>"
$SAME_SENSOR_HOME/tests/test_squid.py 2>&1 $SAME_SENSOR_HOME/tests/test_squid.py > squid.out 2>&1
result=$? result=$?
cat squid.out
echo "</pre>" echo "</pre>"
exit $result exit $result
...@@ -61,7 +61,7 @@ fi ...@@ -61,7 +61,7 @@ fi
echo "<h2>Sourcing CMS environment</h2>" echo "<h2>Sourcing CMS environment</h2>"
export SCRAM_ARCH=slc5_ia32_gcc434 export SCRAM_ARCH=slc5_ia32_gcc434
echo "<pre>" echo "<pre>"
source $SW_DIR/cmsset_default.sh source $SW_DIR/cmsset_default.sh > /dev/null
result=$? result=$?
echo "</pre>" echo "</pre>"
......
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