X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/f7411ff5b11065e770acfa158d227bbd49af7efd..bb9ef76d74d6c1e6d1c5b156c660003a2811a182:/gw-tests/lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index fc12ade..4bc522b 100644
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -33,7 +33,11 @@ PATH=$PWD/../_compiled/bin/:$PATH
 sshgw() {
     local socket="$HOME/.ssh/cangw-connection"
 
-    if [[ "$NO_GW_NEEDED" ]]; then return; fi
+    if [[ "$1" = "-f" ]]; then
+	    shift
+    else
+    	if [[ "$NO_GW_NEEDED" ]]; then return; fi
+    fi
 
     if [[ ! -S $socket ]] || ! ssh -x -a -S $socket root@192.168.2.3 true; then
 	# Create master connection to speed up subsequenct command.
@@ -51,22 +55,21 @@ _plot() {
     rm -rf *.pdf *.png
     for i in "" $ADDITIONAL_PLOTS; do
 	plot_cmds $i | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n{\/*0.75 (GW kernel $kvers, Traffic $traffic, Load $load)}\"/" > plot.gp
-	if [[ ! -s plot.gp ]]; then return; fi
+	if [[ ! -s plot.gp ]]; then continue; fi
 	if [ -z "$OPT_NO_X11" ]; then
 	    echo "set terminal x11 enhanced; $(< plot.gp)" | gnuplot -persist
 	fi
+	test "$(gnuplot --version)" = "gnuplot 4.2 patchlevel 5 " && continue
 	echo "set terminal pdfcairo solid color enhanced; " \
 	     "set output \"graph$i.pdf\";" \
 	     "set pointsize 0.5;" \
 	    "$(< plot.gp)" | gnuplot
 	echo 'set terminal pngcairo color enhanced size 750,525 font ",10" ;' \
 	    "$(< plot.gp)" | gnuplot > graph$i.png
-	mkdir -p thumb
 	convert -resize 150x105 -gamma 0.5 -quality 90 -type Palette -depth 8 graph$i.png tgraph$i.png
 #     echo 'set terminal pngcairo color enhanced size 150,105 font ",1";' \
 # 	"$(< plot.gp)" | gnuplot > thumb/${testname}$i.png
     done
-
 }
 
 echo_plot() {
@@ -90,7 +93,7 @@ traffic_and_length() {
 start_load() {
     case $load in
 	none) ;;
-	cpu) sshgw 'hackbench -g 3 -l 10000' & loadpid=$!;;
+	cpu) sshgw 'hackbench -g 3 -l 100000' & loadpid=$!;;
 	eth) ping -f -s 60000 -q 192.168.2.3 & loadpid=$!;; # TODO: Generate eth load from another computer
 	can) latester -q -d can1 -i 0x7ff & loadpid=$!;;
 	*) error "Unknown load specification: $load"
@@ -164,7 +167,7 @@ _run() {
     else loads=${load:-$OPT_LOAD}
     fi
     hostkvers=${hostkvers:-host-$(uname -r)}
-    kvers=${kvers:-$(sshgw uname -r)}
+    kvers=${kvers:-$(sshgw -f uname -r)}
     test=$(basename $0 .sh)
     for load in $loads; do
     for traffic in $traffics; do