improve reporting

SiteTests/testjob/tests/CE-cms-dummy

@@ -126,24 +126,26 @@ if [ $isEGEE == 1 ]; then
     fi
 
     if [ -z $GLITE_LOCATION ]; then
-	echo "<h3>"
-	echo "ERROR: GLITE_LOCATION not defined"
-	echo "</h3>"
+	echo "<h4>"
+	echo "GLITE_LOCATION not defined"
+	echo "</h4>"
     else
-	echo "<p>GLITE_LOCATION =" $GLITE_LOCATION
-	filetosource=${GLITE_LOCATION}/etc/profile.d/grid-env.sh
-	echo "<p>try {GLITE_LOCATION}/etc/profile.d/grid-env.sh"
-	if [ -r "$filetosource" ]; then
-	    source "$filetosource" &>/dev/null
-	    [ -r `which lcg-ls` ] && echo "<p><strong>lcg-ls found ! as " `which lcg-ls` "</strong><p>"
-	    which lcg-ls > /dev/null && lcglsOK=1
-	fi
-	filetosource=${GLITE_LOCATION}/../etc/profile.d/grid-env.sh
-	echo "<p>try {GLITE_LOCATION}/../etc/profile.d/grid-env.sh"
-	if [ -r "$filetosource" ]; then
-	    source "$filetosource" &>/dev/null
-	    [ -r `which lcg-ls` ] && echo "<p><strong>lcg-ls found ! as " `which lcg-ls` "</strong><p>"
-	    which lcg-ls > /dev/null && lcglsOK=1
+	if [ $lcglsOK == 0 ] ; then
+	    echo "<p>GLITE_LOCATION =" $GLITE_LOCATION
+	    filetosource=${GLITE_LOCATION}/etc/profile.d/grid-env.sh
+	    echo "<p>try {GLITE_LOCATION}/etc/profile.d/grid-env.sh"
+	    if [ -r "$filetosource" ]; then
+		source "$filetosource" &>/dev/null
+		[ -r `which lcg-ls` ] && echo "<p><strong>lcg-ls found ! as " `which lcg-ls` "</strong><p>"
+		which lcg-ls > /dev/null && lcglsOK=1
+	    fi
+	    filetosource=${GLITE_LOCATION}/../etc/profile.d/grid-env.sh
+	    echo "<p>try {GLITE_LOCATION}/../etc/profile.d/grid-env.sh"
+	    if [ -r "$filetosource" ]; then
+		source "$filetosource" &>/dev/null
+		[ -r `which lcg-ls` ] && echo "<p><strong>lcg-ls found ! as " `which lcg-ls` "</strong><p>"
+		which lcg-ls > /dev/null && lcglsOK=1
+	    fi
 	fi
     fi