Other test added

diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644 (file)
index 0000000..7094dba
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,8 @@
+T=$(filter-out _lib.sh,$(wildcard *.sh))
+
+.PHONY: $(T)
+
+all: $(T)
+
+$(T):%:
+       ./$@ --pdf-only

diff --git a/tests/lib.sh b/tests/_lib.sh
similarity index 77%
rename from tests/lib.sh
rename to tests/_lib.sh
index 984af0a37d76bcd382aed2bd392ad944bccffddb..5eb70fd419641a0f11d6d2f24e74faec0b148683 100644 (file)
--- a/tests/lib.sh
+++ b/tests/_lib.sh
@@ -2,6 +2,7 @@
 while [ $# -gt 0 ]; do
     case "$1" in
        -p) OPT_PLOT_ONLY=1; shift;;
 while [ $# -gt 0 ]; do
     case "$1" in
        -p) OPT_PLOT_ONLY=1; shift;;

+       --pdf-only) OPT_PDF_ONLY=1; shift;;

     esac
 done
 
     esac
 done
 


@@ -59,9 +60,7 @@ prepare_socketcan_virtual() {
 }
 
 run_tests() {
 }
 
 run_tests() {

-    [ "$OPT_PLOT_ONLY" -eq 1 ] && return
-       
-    tests=${TESTS:-lincan_hw socketcan_hw}
+    tests=${TESTS:-socketcan_hw lincan_hw}

     for i in $tests; do
        prepare_$i
        t
     for i in $tests; do
        prepare_$i
        t


@@ -71,9 +70,21 @@ run_tests() {
 plot() {
     if [ -n "$PLOT_CMD" ]; then
        echo "set terminal postscript color eps enhanced;
 plot() {
     if [ -n "$PLOT_CMD" ]; then
        echo "set terminal postscript color eps enhanced;

-             set output '`basename $0 .sh`.eps'; $PLOT_CMD" | gnuplot
-       echo "set terminal x11 enhanced; $PLOT_CMD" | gnuplot -persist
+             $PLOT_CMD" | gnuplot | epstopdf --filter > `basename $0 .sh`.pdf
+       if [ -z "$OPT_PDF_ONLY" ]; then
+           echo "set terminal x11 enhanced; $PLOT_CMD" | gnuplot -persist
+       fi

     fi
 }
 
     fi
 }
 

-trap 'run_tests && plot' EXIT
+go() {
+    d=results/`basename $0 .sh`/`uname -r`
+    mkdir -p $d
+    cd $d
+    
+    [ -n "$OPT_PLOT_ONLY" ] || run_tests
+    plot
+
+}
+
+trap 'go' EXIT

diff --git a/tests/rtt-300MHz.sh b/tests/rtt-300MHz.sh
new file mode 100755 (executable)
index 0000000..a76f063
--- /dev/null
+++ b/tests/rtt-300MHz.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+. _lib.sh
+
+t() {
+    PID_S=`vca_canping -s 1 -b -r -d $CAN1`
+    cpufreq-set -f 300
+    vca_canping -m 1 -r -v -g $DRIVER -t 1 -d $CAN0 -w 2 -c 10000
+    cpufreq-set -f 2400
+    kill $PID_S
+}
+
+
+
+PLOT_CMD='
+set title "Round-trip time (`uname -r`, CPU\\@300 MHz)"
+set logscale y
+set grid
+set xlabel "Time [{/Symbol m}s]"
+set ylabel "Latency profile [messages]"
+plot [0:] "socketcan-1000.dat" with lp title "Socketcan",\
+          "lincan-1000.dat" with lp title "Lincan"
+'
+

diff --git a/tests/rtt-virtual-300MHz.sh b/tests/rtt-virtual-300MHz.sh
new file mode 100755 (executable)
index 0000000..5833c23
--- /dev/null
+++ b/tests/rtt-virtual-300MHz.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+. _lib.sh
+
+t() {
+    PID_S=`vca_canping -s 1 -b -r -d $CAN0`
+    cpufreq-set -f 300
+    vca_canping -m 1 -r -v -g $DRIVER -t 1 -d $CAN0 -w 5 -c 10000
+    cpufreq-set -f 2400
+    kill $PID_S
+}
+
+TESTS="lincan_virtual socketcan_virtual"
+
+PLOT_CMD='
+set title "Round-trip time - virtual CAN (`uname -r`, CPU\\@300 MHz)"
+set logscale y
+set grid
+set xlabel "Time [{/Symbol m}s]"
+set ylabel "Latency profile [messages]"
+plot [0:] "socketcan-virtual-1000.dat" with lp title "Socketcan",\
+          "lincan-virtual-1000.dat" with lp title "Lincan"
+'
+

diff --git a/tests/t02-virtual.sh b/tests/rtt-virtual.sh
similarity index 84%
rename from tests/t02-virtual.sh
rename to tests/rtt-virtual.sh
index 9cc67b8d18926be43378f11b373ce62c43d43a7c..fb42e3ca89deb0227a31080684f20f65e539205a 100755 (executable)
--- a/tests/t02-virtual.sh
+++ b/tests/rtt-virtual.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-. lib.sh
+. _lib.sh

 
 t() {
     PID_S=`vca_canping -s 1 -b -r -d $CAN0`
 
 t() {
     PID_S=`vca_canping -s 1 -b -r -d $CAN0`


@@ -11,9 +11,9 @@ t() {
 TESTS="lincan_virtual socketcan_virtual"
 
 PLOT_CMD='
 TESTS="lincan_virtual socketcan_virtual"
 
 PLOT_CMD='

+set title "Round-trip time - virtual CAN (`uname -r`)"

 set logscale y
 set grid
 set logscale y
 set grid

-set title "Round-trip time measurement - virtual CAN (`uname -r`)"

 set xlabel "Time [{/Symbol m}s]"
 set ylabel "Latency profile [messages]"
 plot [0:] "socketcan-virtual-1000.dat" with lp title "Socketcan",\
 set xlabel "Time [{/Symbol m}s]"
 set ylabel "Latency profile [messages]"
 plot [0:] "socketcan-virtual-1000.dat" with lp title "Socketcan",\

diff --git a/tests/t01-simple.sh b/tests/rtt.sh
similarity index 70%
rename from tests/t01-simple.sh
rename to tests/rtt.sh
index e6e92df8f2e768be705cedc256ac2ccd914b510e..73978696465e3e6c54628078ab2550335a7e8c57 100755 (executable)
--- a/tests/t01-simple.sh
+++ b/tests/rtt.sh
@@ -1,17 +1,19 @@
 #!/bin/sh
 
 #!/bin/sh
 

-. lib.sh
+. _lib.sh

 
 t() {
     PID_S=`vca_canping -s 1 -b -r -d $CAN1`
 
 t() {
     PID_S=`vca_canping -s 1 -b -r -d $CAN1`

-    vca_canping -m 1 -r -v -g $DRIVER -t 1 -d $CAN0 -w 5 -c 1000
+    vca_canping -m 1 -r -v -g $DRIVER -t 1 -d $CAN0 -w 2 -c 10000

     kill $PID_S
 }
 
     kill $PID_S
 }
 

+
+

 PLOT_CMD='
 PLOT_CMD='

+set title "Round-trip time (`uname -r`)"

 set logscale y
 set grid
 set logscale y
 set grid

-set title "Round-trip time measurement (`uname -r`)"

 set xlabel "Time [{/Symbol m}s]"
 set ylabel "Latency profile [messages]"
 plot [0:] "socketcan-1000.dat" with lp title "Socketcan",\
 set xlabel "Time [{/Symbol m}s]"
 set ylabel "Latency profile [messages]"
 plot [0:] "socketcan-1000.dat" with lp title "Socketcan",\