From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Wed, 28 Jul 2010 14:11:07 +0000 (+0000)
Subject: Handle cases with stty not returning anything
X-Git-Tag: glite-security-gsoap-plugin_R_2_1_2_2~13
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=a70e15ee76f6d6d8cf0b83c6c340d75153eeadf2;p=jra1mw.git

Handle cases with stty not returning anything
---

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common.sh b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
index 13ffb8d..d3feaf2 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-common.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
@@ -109,6 +109,7 @@ SYS_TAIL=tail
 SYS_DATE=date
 SYS_EXPR=expr
 SYS_BC=bc
+SYS_SCP=bc
 
 # not used at the moment
 DEBUG=2
diff --git a/org.glite.testsuites.ctb/LB/tests/test-common.sh b/org.glite.testsuites.ctb/LB/tests/test-common.sh
index f0ca470..fe64166 100644
--- a/org.glite.testsuites.ctb/LB/tests/test-common.sh
+++ b/org.glite.testsuites.ctb/LB/tests/test-common.sh
@@ -50,8 +50,13 @@ export LC_ALL
 # Seek for terminal size and, if needed, set default size
 if [ -z "${LINES}" -o -z "${COLUMNS}" ]; then
 	stty_size=`stty size`
-	LINES=`echo ${stty_size} | awk '{print $1}'`
-	COLUMNS=`echo ${stty_size} | awk '{print $2}'`
+	if [ $? = 0 ]; then  
+		LINES=`echo ${stty_size} | awk '{print $1}'`
+		COLUMNS=`echo ${stty_size} | awk '{print $2}'`
+	else
+		LINES=24
+		COLUMNS=80
+	fi
 fi
 if [ ! $LINES -ge 0 ]; then LINES=24; fi
 if [ ! $COLUMNS -ge 0 ]; then COLUMNS=80; fi