Fix mod test

[can-benchmark.git] / gw-tests / lib.sh

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 46031a4e0a8416c273a91092269663a08673b4c3..43afe6de213898e5b6a095b4d06e9ffe18c67051 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -15,7 +15,7 @@ while [ $# -gt 0 ]; do
        -p) OPT_PLOT_ONLY=1; shift;;
        -X|--no-x11-plot) OPT_NO_X11=1; shift;;
        -t) case "$2" in
-               all|floof|50|oneatatime) OPT_TRAFFIC=$2;;
+               all|flood|50|oneatatime) OPT_TRAFFIC=$2;;
                *) error "Unknown traffic specification: $2";;
            esac;
            shift 2;;
@@ -59,16 +59,6 @@ _plot() {
 
 }
 
-create_dirs() {
-    local kver=$1
-    local traffic=$2
-    local test=$3
-
-    local  d=results/$kver/$traffic/$test
-    mkdir -p $d
-    echo $d
-}
-
 echo_plot() {
     plot=$1
     [[ "$_plot_separator" ]] && echo ", \\"
@@ -98,7 +88,8 @@ _run() {
     fi
     for OPT_TRAFFIC in $traffics; do
     for kvers in $kernel_versions; do
-       dir=$(create_dirs $kvers $OPT_TRAFFIC $(basename $0 .sh))
+       dir="results/host-$(uname -r)/$kvers/$OPT_TRAFFIC/$(basename $0 .sh)"
+       mkdir -p $dir
        script=$PWD/$0
        cd $dir
        echo "Working directory: $dir"
@@ -114,6 +105,8 @@ _run() {
            sshgw 'chrt -p -f 50 `pidof irq/146-can1` > /dev/null || :'
            sshgw 'chrt -p -f 49 `pidof sirq-net-rx/0` > /dev/null || :'
            sshgw 'chrt -p -f 49 `pidof sirq-net-tx/0` > /dev/null || :'
+           # Set the length of qdisc queue to avoid ENOBUFS errors
+           ifconfig can0 txqueuelen 200
            cleanupgw
 
            main
@@ -122,6 +115,7 @@ _run() {
        if [[ ! "$OPT_PLOT_DISABLE" ]]; then
            _plot
        fi
+       cd -
     done
     done
 }