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

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

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index 3ea41531bf94a5f60d097999bdaaf4b0b03b51df..f82ea28d855ac6a07a9bdf215a579fd559472832 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -1,7 +1,17 @@
 set -e
 
+while [ $# -gt 0 ]; do
+    case "$1" in
+       -P) OPT_PLOT_DISABLE=1; shift;;
+       -p) OPT_PLOT_ONLY=1; shift;;
+       -X|--no-x11-plot) OPT_NO_X11=1; shift;;
+    esac
+done
+
 PATH=$PWD/../_compiled/bin/:$PATH
 
+COUNT=10000
+
 error() {
     echo $1 >&2
     exit 1
@@ -26,32 +36,30 @@ cleanupgw() {
     sshgw 'eval $(cangw -L|sed -e s/-A/-D/ -e "s/#.*/;/")'
 }
 
-plot() {
-#    for i in "${!PLOT_CMD[@]}"; do
+_plot() {
     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)\"/")
-       if [ -z "$OPT_NO_X11" ]; then
-           echo "set terminal x11 enhanced; ${cmd}" | gnuplot -persist
-       fi
-       I=${i/0/}
-       echo 'set terminal postscript color eps enhanced size 6cm,4cm lw 1 "Times-Roman" 10;' \
-            'set lmargin 8;' \
-             "${cmd}" | gnuplot > ${testname}$I.eps
-       echo "set terminal postscript color eps enhanced;" \
-            "${cmd}" | 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
-    done
+
+    cmd=$(plot_cmds)                   # Get plot commands
+    cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n($kvers)\"/")
+    if [ -z "$OPT_NO_X11" ]; then
+       echo "set terminal x11 enhanced; ${cmd}" | 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
+    echo "set terminal postscript color eps enhanced;" \
+       "${cmd}" | 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
+
 }
 
 create_dirs_and_links() {
     local test=$1
     local kver=$2
 
-    set -x
     local  d=results/by-kern/$kver/$test
     mkdir -p $d
     mkdir -p results/by-test/$test
@@ -60,23 +68,41 @@ create_dirs_and_links() {
 }
 
 _run() {
-    cleanupgw
-    dir=$(create_dirs_and_links $(basename $0 .sh)  $(sshgw uname -r))
-    cd $dir
-    main
+    if [[ ! "$OPT_PLOT_ONLY" ]]; then
+       kernel_versions=$(sshgw uname -r)
+    else
+       kernel_versions=$(ls results/by-kern)
+    fi
+    for kvers in $kernel_versions; do
+       dir=$(create_dirs_and_links $(basename $0 .sh) $kvers)
+       script=$PWD/$0
+       cd $dir
+       if [[ ! "$OPT_PLOT_ONLY" ]]; then
+           cleanupgw
+           main
+           cp $script .
+       fi
+       _plot
+    done
 }
 
 test_end() {
     test_end_called=t
-    trap '' DEBUG
+    exit_ok=
     _run
+    exit_ok=t
 }
 
-exit() {
+_myexit() {
+    code=$?
+    cmd=$BASH_COMMAND
     if [[ ! "$test_end_called" ]]; then
        test_end_called=t
        error "bug in the test script: No test_end called"
     fi
+    if ! test -n "$exit_ok"; then
+       error "FATAL: Command '$cmd' exited with code $code"
+    fi
 }
 
-trap 'exit' EXIT
+trap '_myexit' EXIT