From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Fri, 4 May 2012 12:21:41 +0000 (+0000)
Subject: Use BC exclusively.
X-Git-Tag: merge_torque_to_head_after~17
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=fbefdf602fc415b9e55e4766590abaed06963245;p=jra1mw.git

Use BC exclusively.
---

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-statistics.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-statistics.sh
index 9538348..d7a43fe 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-statistics.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-statistics.sh
@@ -125,7 +125,7 @@ test_start
 
 # check_binaries
 printf "Testing if all binaries are available"
-check_binaries $GRIDPROXYINFO $SYS_GREP $SYS_SED $LBJOBREG $SYS_AWK $LBJOBSTATUS $SYS_DATE $SYS_EXPR $LB_STATS $LB_FROMTO $SYS_BC
+check_binaries $GRIDPROXYINFO $SYS_GREP $SYS_SED $LBJOBREG $SYS_AWK $LBJOBSTATUS $SYS_DATE $LB_STATS $LB_FROMTO $SYS_BC
 if [ $? -gt 0 ]; then
 	test_failed
 else
@@ -241,7 +241,7 @@ fi
 
 		printf "Comparing. 'Submitted' -> 'Running' should take longer than 'Submitted' -> 'Done/OK': "
 
-		donecresult=`$SYS_EXPR $doneaverage \> $average`
+		donecresult=`$SYS_ECHO "$doneaverage > $average" | $SYS_BC`
 		if [ "$donecresult" -eq "1" ]; then
 			printf "OK"
 			test_done
@@ -260,13 +260,13 @@ fi
 		let i=0 
 		$SYS_CAT fromto.out.ces.$$ | while read ce; do
 			printf "$i.\t$ce:\t${averages[$i]}\t${dispersions[$i]}"
-			cresult=`$SYS_EXPR ${averages[$i]} \>= 0`
+			cresult=`$SYS_ECHO "${averages[$i]} >= 0" | $SYS_BC`
 			if [ "$cresult" -ne "1" ]; then
 				test_failed
 				print_error "Bad average value"
 			fi
 			# Also check dispersion
-			cresult=`$SYS_EXPR ${dispersions[$i]} \>= 0`
+			cresult=`$SYS_ECHO "${dispersions[$i]} >= 0" | $SYS_BC`
 			if [ "$cresult" -eq "1" ]; then
 				test_done
 			else
@@ -289,7 +289,7 @@ fi
                 let i=0 
                 $SYS_CAT rates.out.ces.$$ | while read ce; do
                         printf "$i.\t$ce:\t${rates[$i]}"
-                        cresult=`$SYS_EXPR ${rates[$i]} \>= 0`
+                        cresult=`$SYS_ECHO "${rates[$i]} >= 0" | $SYS_BC`
                         if [ "$cresult" -eq "1" ]; then
                                 test_done
                         else