Allow multiple graphs per test

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

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index f6f4439b656e5e58adfa24c4bc4ab81d3a47ca4f..8a8a9e91af5f1056590a8d8373b727afc8ec497e 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -46,21 +46,22 @@ cleanupgw() {
 
 _plot() {
     local testname=`basename $0 .sh`
-
-    plot_cmds | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n{\/*0.75 (GW kernel $kvers, Traffic $traffic, Load $load)}\"/" > plot.gp
-    if [[ ! -s plot.gp ]]; then return; fi
-    if [ -z "$OPT_NO_X11" ]; then
-       echo "set terminal x11 enhanced; $(< plot.gp)" | gnuplot -persist
-    fi
-    I=''
-    echo "set terminal pdfcairo solid color enhanced; set output \"${testname}$I.pdf\";" \
-       "$(< plot.gp)" | gnuplot
-    echo 'set terminal pngcairo color enhanced size 750,525 font ",10" ;' \
-       "$(< plot.gp)" | gnuplot > ${testname}$I.png
-    mkdir -p thumb
-    convert -resize 150x105 -gamma 0.5 -quality 90 -type Palette -depth 8 ${testname}$I.png thumb/${testname}$I.png
+    rm -rf *.pdf *.png
+    for i in "" $ADDITIONAL_PLOTS; do
+       plot_cmds $i | sed -e "/set title/ s/[\"']\(.*\)[\"']/\"\1\\\\n{\/*0.75 (GW kernel $kvers, Traffic $traffic, Load $load)}\"/" > plot.gp
+       if [[ ! -s plot.gp ]]; then return; fi
+       if [ -z "$OPT_NO_X11" ]; then
+           echo "set terminal x11 enhanced; $(< plot.gp)" | gnuplot -persist
+       fi
+       echo "set terminal pdfcairo solid color enhanced; set output \"graph$i.pdf\";" \
+           "$(< plot.gp)" | gnuplot
+       echo 'set terminal pngcairo color enhanced size 750,525 font ",10" ;' \
+           "$(< plot.gp)" | gnuplot > graph$i.png
+       mkdir -p thumb
+       convert -resize 150x105 -gamma 0.5 -quality 90 -type Palette -depth 8 graph$i.png tgraph$i.png
 #     echo 'set terminal pngcairo color enhanced size 150,105 font ",1";' \
-#      "$(< plot.gp)" | gnuplot > thumb/${testname}$I.png
+#      "$(< plot.gp)" | gnuplot > thumb/${testname}$i.png
+    done
 
 }