X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/df1100f6c08cbdea4d97234547c525f12af7f6b5..ecef49aa3f32c2a5a69d1deb1b4427007c810cd4:/tests/_lib.sh

diff --git a/tests/_lib.sh b/tests/_lib.sh
index 6100f7e..3f9ef7c 100644
--- a/tests/_lib.sh
+++ b/tests/_lib.sh
@@ -1,6 +1,7 @@
 
 while [ $# -gt 0 ]; do
     case "$1" in
+	-P) OPT_PLOT_DISABLE=1; shift;;
 	-p) OPT_PLOT_ONLY=1; shift;;
 	-X|--no-x11-plot) OPT_NO_X11=1; shift;;
     esac
@@ -50,16 +51,24 @@ prepare_lincan_virtual() {
     sleep 0.1
 }
 
+socketcan_set_bitrate() {
+    local canX=$1
+    if [ -f /sys/class/net/$canX/can_bittiming/bitrate ]; then
+	echo 1000000 > /sys/class/net/$canX/can_bittiming/bitrate
+    else
+	ip link set $canX type can bitrate 1000000
+    fi
+}
 prepare_socketcan_hw() {
     rmmod_can
     modprobe kvaser_pci
-    echo 1000000 > /sys/class/net/can0/can_bittiming/bitrate
+    socketcan_set_bitrate can0
     ip link set up dev can0
-    echo 1000000 > /sys/class/net/can1/can_bittiming/bitrate
-    ip link set up dev can1
-    echo 1000000 > /sys/class/net/can2/can_bittiming/bitrate
+    socketcan_set_bitrate can1
+    ip link set up dev can1 
+    socketcan_set_bitrate can2
     ip link set up dev can2
-    echo 1000000 > /sys/class/net/can3/can_bittiming/bitrate
+    socketcan_set_bitrate can3
     ip link set up dev can3
     CAN0=socketcan:can0
     CAN1=socketcan:can1
@@ -99,6 +108,7 @@ kvers() {
 					  -e 's/ *$//'|tr -s ' ' '_')
     v=$(uname -r)
     [ -n "$cmdline" ] && v="$v:$cmdline"
+    [ -n "$KVERS" ] && v=$KVERS
     echo $v
 }
 
@@ -114,8 +124,8 @@ plot() {
 	echo "set terminal postscript color eps enhanced;
 	      ${cmd}" | gnuplot | epstopdf --filter > `basename $0 .sh`$I.pdf
 	mkdir -p thumb
-	convert -geometry 1000x100 -gamma 0.3 `basename $0 .sh`$I.pdf thumb/`basename $0 .sh`$I.png
-	convert -density 200 -gamma 0.7 -geometry 1000x500 `basename $0 .sh`$I.pdf `basename $0 .sh`$I.png
+	convert -density 30  -gamma 0.5 -quality 90 -type Palette -depth 8 `basename $0 .sh`$I.pdf thumb/`basename $0 .sh`$I.png
+	convert -density 150 -gamma 0.7 -quality 90 -type Palette -depth 8 `basename $0 .sh`$I.pdf `basename $0 .sh`$I.png
     done
 }
 
@@ -156,9 +166,13 @@ go() {
 	if [ ! -n "$OPT_PLOT_ONLY" ]; then
     	    cpufreq-set -f ${clk}MHz
 	    run_tests
-    	    cpufreq-set -f 2400MHz
+    	    cpufreq-set -f ${mhz}MHz
+	else
+	    unset OPT_PLOT_DISABLE
+	fi
+	if [ ! -n "$OPT_PLOT_DISABLE" ]; then
+	    plot
 	fi
-	plot
 	popd
 	set +x
     done