Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark

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

diff --git a/tests/_lib.sh b/tests/_lib.sh
index c512d3519d73e2a2f9eb957809ea0c912adbca26..930f6885a57ce68e396e1c7b7be5f3acda436bf6 100644 (file)
--- a/tests/_lib.sh
+++ b/tests/_lib.sh
@@ -30,7 +30,7 @@ boost_irq_prio() {
 }
 
 rmmod_can() {
-    modprobe -r lincan kvaser_pci vcan
+    modprobe -r lincan kvaser_pci vcan || true
 }
 
 prepare_lincan_hw() {
@@ -78,7 +78,7 @@ prepare_socketcan_hw() {
 prepare_socketcan_virtual() {
     rmmod_can
     modprobe vcan
-    ip link add dev vcan0 type vcan
+    ip link add dev vcan0 type vcan || true
     ip link set up dev vcan0
     CAN0=socketcan:vcan0
     CAN1=socketcan:vcan0
@@ -114,6 +114,7 @@ kvers() {
 
 plot() {
 #    for i in "${!PLOT_CMD[@]}"; do
+    local testname=`basename $0 .sh`
     for i in 0; do
        cmd=`p`                 # Get plot commands
        cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($(kvers), CPU\\\\\\\\@${clk}MHz)\"/")
@@ -154,11 +155,15 @@ create_dirs_and_links() {
 
 go() {
     echo "####################"
-    mhz=`sed -ne '/^cpu MHz/ s/.*:\([^.]+\).*/\1/p' /proc/cpuinfo|head -n 1`
-    if [ -r /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq ]; then
-       local max=$((`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`/1000))
-       local min=$((`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`/1000))
-       mhz="$max $min"
+    if [ ! -n "$OPT_PLOT_ONLY" ]; then
+       mhz=`sed -ne '/^cpu MHz/ s/.*:\([^.]\+\).*/\1/p' /proc/cpuinfo|head -n 1`
+       if [ -r /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq ]; then
+           local max=$((`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`/1000))
+           local min=$((`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`/1000))
+           mhz="$max $min"
+       fi
+    else
+       mhz=$(cd results/by-clck; echo *)
     fi
     for clk in $mhz; do
     echo "===================="