Minor updates and logging output

diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
index c0d54e5..5251911 100755 (executable)
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
@@ -39,6 +39,17 @@ EndHelpHeader
 
 STARTTIME=`date +%s`
 
+egrep -i "Debian|Ubuntu" /etc/issue
+if [ \$? = 0 ]; then
+        INSTALLCMD="apt-get install -q --yes"
+        INSTALLPKGS="lintian"
+else
+        INSTALLCMD="yum install -q -y --nogpgcheck"
+        INSTALLPKGS="rpmlint"
+fi
+
+$INSTALLCMD wget
+
 # read common definitions and functions
 for COMMON in gridsite-common.sh test-common.sh gridsite-common-testbeds.sh
 do

diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
index 150e053..a066488 100755 (executable)
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
@@ -61,6 +61,7 @@ mkdir /var/www/htdocs
 killall httpd apache2 >/dev/null 2>&1
 sleep 1
 killall -9 httpd apache2 >/dev/null 2>&1
+echo Starting httpd -f \$HTTPD_CONF
 httpd -f \$HTTPD_CONF
 
 cd /tmp
@@ -88,6 +89,7 @@ else
 fi
 
 if [ ! -d /etc/vomses ]; then
+       echo Installing experimental VOMS server
        if [ ! -f ./px-voms-install.sh ]; then
                wget -O px-voms-install.sh http://jra1mw.cvs.cern.ch/cgi-bin/jra1mw.cgi/org.glite.testsuites.ctb/PX/tests/px-voms-install.sh?view=co
        fi