Test cleanup

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

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 63ee99d6bfa07ddeb2b7cb40be6f6ae97b8733fc..aa05a26b0cc0768af78c9ee9ea7cb6b082bbe573 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -30,25 +30,22 @@ sshgw() {
 }
 
 cleanupgw() {
-    # Set can interfaces up
-    sshgw 'for i in 0 1; do ip link show dev can$i|grep -q UP || ip link set can$i up type can bitrate 1000000; done'
     sshgw 'cangw -F'
 }
 
 _plot() {
     local testname=`basename $0 .sh`
 
-    cmd=$(plot_cmds)                   # Get plot commands
-    cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($kvers)\"/")
+    plot_cmds | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($kvers)\"/" > plot.gp
     if [ -z "$OPT_NO_X11" ]; then
-       echo "set terminal x11 enhanced; ${cmd}" | gnuplot -persist
+       echo "set terminal x11 enhanced; $(< plot.gp)" | gnuplot -persist
     fi
     I=''
     echo 'set terminal postscript color eps enhanced size 6cm,4cm lw 1 "Times-Roman" 10;' \
        'set lmargin 8;' \
-       "${cmd}" | gnuplot > ${testname}$I.eps
+       "$(< plot.gp)" | gnuplot > ${testname}$I.eps
     echo "set terminal postscript color eps enhanced;" \
-       "${cmd}" | gnuplot | epstopdf --filter > ${testname}$I.pdf
+       "$(< plot.gp)" | gnuplot | epstopdf --filter > ${testname}$I.pdf
     mkdir -p thumb
     convert -density 30  -gamma 0.5 -quality 90 -type Palette -depth 8 ${testname}$I.pdf thumb/${testname}$I.png
     convert -density 150 -gamma 0.7 -quality 90 -type Palette -depth 8 ${testname}$I.pdf ${testname}$I.png
@@ -66,6 +63,13 @@ create_dirs_and_links() {
     echo $d
 }
 
+echo_plot() {
+    plot=$1
+    [[ "$_plot_separator" ]] && echo ", \\"
+    _plot_separator=t
+    echo -n "    " $plot
+}
+
 _run() {
     if [[ ! "$OPT_PLOT_ONLY" ]]; then
        kernel_versions=$(sshgw uname -r)
@@ -78,12 +82,20 @@ _run() {
        cd $dir
        echo "Working directory: $dir"
        if [[ ! "$OPT_PLOT_ONLY" ]]; then
+           # Remove data from the last measurement
            rm -rf *
+            # Set can interfaces up
+           sshgw 'for i in 0 1; do ip link show dev can$i|grep -q UP || ip link set can$i up type can bitrate 1000000; done'
+            # Delete all vcan interfaces
+           sshgw 'for dev in $(ip l|grep -o vcan[^:]\\+); do ip link del dev $dev; done'
            cleanupgw
+           
            main
            cp $script .
        fi
-       _plot
+       if [[ ! "$OPT_PLOT_DISABLE" ]]; then
+           _plot
+       fi
     done
 }