Updated order of checking for CMSSW to look in CVMFS first in test_sq…

…uid.sh. Updated tarball. JAMES LETTS
jamesletts · Jan 12, 2015 · 4570c73 · 4570c73
1 parent 7eb266f
commit 4570c73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/test_squid/test_squid.sh b/test_squid/test_squid.sh
@@ -17,24 +17,24 @@ function warn {
 }
 
 # set up CMSSW environment; CMS_PATH needed for squid/frontier test:
-if [ -f "$VO_CMS_SW_DIR/cmsset_default.sh" ]; then
-  echo "Found CMS SW in $VO_CMS_SW_DIR" 1>&2
-  source "$VO_CMS_SW_DIR/cmsset_default.sh"
-elif [ -f "$OSG_APP/cmssoft/cms/cmsset_default.sh" ]; then
-  echo "Found CMS SW in $OSG_APP/cmssoft/cms" 1>&2
-  source "$OSG_APP/cmssoft/cms/cmsset_default.sh"
-elif [ -f "$CVMFS/cms.cern.ch/cmsset_default.sh" ]; then
+if [ -f "$CVMFS/cms.cern.ch/cmsset_default.sh" ]; then
   echo "Found CMS SW in $CVMFS/cms.cern.ch" 1>&2
   source "$CVMFS/cms.cern.ch/cmsset_default.sh"
 elif [ -f "/cvmfs/cms.cern.ch/cmsset_default.sh" ]; then
   echo "Found CMS SW in /cvmfs/cms.cern.ch" 1>&2
   source "/cvmfs/cms.cern.ch/cmsset_default.sh"
+elif [ -f "$VO_CMS_SW_DIR/cmsset_default.sh" ]; then
+  echo "Found CMS SW in $VO_CMS_SW_DIR" 1>&2
+  source "$VO_CMS_SW_DIR/cmsset_default.sh"
+elif [ -f "$OSG_APP/cmssoft/cms/cmsset_default.sh" ]; then
+  echo "Found CMS SW in $OSG_APP/cmssoft/cms" 1>&2
+  source "$OSG_APP/cmssoft/cms/cmsset_default.sh"
 else
   echo "cmsset_default.sh not found!\n" 1>&2
-  echo "Looked in $VO_CMS_SW_DIR/cmsset_default.sh" 1>&2
-  echo "and $OSG_APP/cmssoft/cms/cmsset_default.sh" 1>&2
-  echo "and $CVMFS/cms.cern.ch/cmsset_default.sh" 1>&2
+  echo "Looked in$CVMFS/cms.cern.ch/cmsset_default.sh" 1>&2
   echo "and /cvmfs/cms.cern.ch/cmsset_default.sh" 1>&2
+  echo "and $VO_CMS_SW_DIR/cmsset_default.sh" 1>&2
+  echo "and $OSG_APP/cmssoft/cms/cmsset_default.sh" 1>&2
   exit 1
 fi
 

diff --git a/test_squid/test_squid.tgz b/test_squid/test_squid.tgz