Using new OSG SW discovery and fixed bug making the test always OK

SiteTests/MonteCarlo/tests/CE-cms-mc

@@ -15,13 +15,26 @@ echo "</pre>"
 # Source the CMS environment
 echo "<h3>Sourcing the CMS environment</h3>"
 export SCRAM_ARCH=slc5_amd64_gcc462
-if [ -n "$OSG_APP" ] ; then
-    echo "<p>This is an OSG site</p>"
-    SW_DIR=$OSG_APP/cmssoft/cms
-    source $OSG_GRID/setup.sh
-    result=$?
+if [ -n "$OSG_GRID" ] ; then
+    [ -f $OSG_GRID/setup.sh ] && source $OSG_GRID/setup.sh
+    echo "<p>OSG Middleware</p>"
+    if [ -d $OSG_APP/cmssoft/cms ] ;then
+         SW_DIR=$OSG_APP/cmssoft/cms
+         echo "<p>Checking variable: \$OSG_APP/cmssoft/cms=$OSG_APP/cmssoft/cms</p>"
+    elif [ -d $CVMFS/cms.cern.ch ] ; then
+         SW_DIR=$CVMFS/cms.cern.ch
+         echo "<p>Checking variable: \$CVMFS/cms.cern.ch=$CVMFS/cms.cern.ch</p>"
+    elif [ -d /cvmfs/cms.cern.ch ] ; then
+         SW_DIR=/cvmfs/cms.cern.ch
+         echo "<p>Checking fallback location: /cvmfs/cms.cern.ch</p>"
+    else
+         echo "<p>"
+         echo "Cannot find CMS software area."
+         echo "</p>"
+         exit $SAME_ERROR
+    fi
 elif [ -n "$VO_CMS_SW_DIR" ] ; then
-    echo "<p>This is an LCG site</p>"
+    echo "<p>gLite Middleware</p>"
     SW_DIR=$VO_CMS_SW_DIR
     result=$?
 else
@@ -81,10 +94,11 @@ if [ $? -ne 0 ]; then
 else
   echo "<pre>"
   chmod u+x RuntimeSAMStageOut.py 
-  ./RuntimeSAMStageOut.py | sed -e 's/&/&amp;/g' | sed -e 's/</\&lt;/g' | sed -e 's/>/\&gt;/g' 2>&1
+  ./RuntimeSAMStageOut.py > RuntimeSAMStageOut.out 2>&1
   EXIT_STATUS=$?
+  sed -e 's/&/&amp;/g' RuntimeSAMStageOut.out | sed -e 's/</\&lt;/g' | sed -e 's/>/\&gt;/g'
+  echo "</pre>"
 fi
-echo "</pre>"
 
 if [ $EXIT_STATUS -ne 0 -a $EXIT_STATUS -ne 4 ] ; then
    echo "<p>ERROR: Stage Out Test failed: $EXIT_STATUS</p>"