From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 27 Aug 2009 16:44:20 +0000 (+0200)
Subject: Merge branch 'master' of rtime:/var/git/can-benchmark
X-Git-Tag: fix-allnoconfig~371
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/7e09e9a6032afa1fa5401e6e232b309a9ea72400?hp=c5fd68159fa8275787f92b3625ac0ffc0ba95599

Merge branch 'master' of rtime:/var/git/can-benchmark
---

diff --git a/tests/_lib.sh b/tests/_lib.sh
index 6327026..987d753 100644
--- a/tests/_lib.sh
+++ b/tests/_lib.sh
@@ -44,6 +44,7 @@ prepare_lincan_virtual() {
     rmmod_can
     modprobe -C /dev/null lincan hw=virtual io=0 baudrate=0
     CAN0=/dev/can0
+    CAN1=/dev/can0
     DRIVER=lincan-virtual
     sleep 0.1
 }
@@ -70,6 +71,7 @@ prepare_socketcan_virtual() {
     ip link add dev vcan0 type vcan
     ip link set up dev vcan0
     CAN0=socketcan:vcan0
+    CAN1=socketcan:vcan0
     DRIVER=socketcan-virtual
 }
 
@@ -121,7 +123,12 @@ create_dirs_and_links() {
 
 go() {
     echo "####################"
-    mhz=${MHZ:-2400 300}
+    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
     for clk in $mhz; do
     echo "===================="
 	dir=$(create_dirs_and_links `basename $0 .sh` `uname -r` $clk)