Fix Mhz->MHz

[can-benchmark.git] / tests / _lib.sh

diff --git a/tests/_lib.sh b/tests/_lib.sh
index 13916b811600568f5666e240181943b657a196a7..3eefa5ecab4a3fa29288601432cd2d23d19fa26e 100644 (file)
--- a/tests/_lib.sh
+++ b/tests/_lib.sh
@@ -51,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
@@ -108,7 +116,7 @@ plot() {
 #    for i in "${!PLOT_CMD[@]}"; do
     for i in 0; do
        cmd=`p`                 # Get plot commands
-       cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($(kvers), CPU\\\\\\\\@${clk}Mhz)\"/")
+       cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($(kvers), CPU\\\\\\\\@${clk}MHz)\"/")
        if [ -z "$OPT_NO_X11" ]; then
            echo "set terminal x11 enhanced; ${cmd}" | gnuplot -persist
        fi
@@ -116,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 -quality 90 -type Palette -depth 8 `basename $0 .sh`$I.pdf thumb/`basename $0 .sh`$I.png
-       convert -density 200 -gamma 0.7 -geometry 1000x500 -quality 90 -type Palette -depth 8 `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
 }