From bacefba61066aae94dc9ec031d1723b344a49151 Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 27 Aug 2009 19:23:41 +0200
Subject: [PATCH] Convert plot commands to be returned by function p()

---
 tests/_lib.sh        | 5 +++--
 tests/ethflood.sh    | 6 +++---
 tests/ethflood64k.sh | 6 +++---
 tests/ethload.sh     | 6 +++---
 tests/ethloadsend.sh | 6 +++---
 tests/rtt-virtual.sh | 6 +++---
 tests/rtt-w.sh       | 5 +++--
 tests/rtt.sh         | 5 +++--
 8 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/tests/_lib.sh b/tests/_lib.sh
index 64620c0..0df9d91 100644
--- a/tests/_lib.sh
+++ b/tests/_lib.sh
@@ -100,8 +100,9 @@ kvers() {
 }
 
 plot() {
-    for i in "${!PLOT_CMD[@]}"; do
-	cmd="${PLOT_CMD[$i]}";
+#    for i in "${!PLOT_CMD[@]}"; do
+    for i in 0; do
+	cmd=`p`			# Get plot commands
 	cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/'\1 ($(kvers), CPU\\\\@${clk}Mhz)'/")
 	if [ -z "$OPT_NO_X11" ]; then
 	    echo "set terminal x11 enhanced; ${cmd}" | gnuplot -persist
diff --git a/tests/ethflood.sh b/tests/ethflood.sh
index 628856e..cdad2cd 100755
--- a/tests/ethflood.sh
+++ b/tests/ethflood.sh
@@ -18,7 +18,7 @@ t() {
 
 
 
-PLOT_CMD='
+p() { cat <<EOF
 set title "Round-trip time with ethernet load - ping -f"
 set logscale y
 set grid
@@ -28,5 +28,5 @@ plot [0:] "socketcan-norm-1000.dat" with lp lt 1 title "Socketcan",\
           "lincan-norm-1000.dat" with lp lt 2 title "Lincan",\
           "socketcan-boost-1000.dat" with lp lt 1 title "Socketcan boosted IRQ prio",\
           "lincan-boost-1000.dat" with lp lt 2 title "Lincan boosted IRQ prio"
-'
-
+EOF
+}
diff --git a/tests/ethflood64k.sh b/tests/ethflood64k.sh
index 2d40f3a..716a466 100755
--- a/tests/ethflood64k.sh
+++ b/tests/ethflood64k.sh
@@ -18,7 +18,7 @@ t() {
 
 
 
-PLOT_CMD='
+p() { cat <<EOF
 set title "Round-trip time with ethernet load - ping -fs 64000"
 set logscale y
 set grid
@@ -28,5 +28,5 @@ plot [0:] "socketcan-norm-1000.dat" with lp lt 1 title "Socketcan",\
           "lincan-norm-1000.dat" with lp lt 2 title "Lincan",\
           "socketcan-boost-1000.dat" with lp lt 1 title "Socketcan boosted IRQ prio",\
           "lincan-boost-1000.dat" with lp lt 2 title "Lincan boosted IRQ prio"
-'
-
+EOF
+}
diff --git a/tests/ethload.sh b/tests/ethload.sh
index 8aecd34..41dd777 100755
--- a/tests/ethload.sh
+++ b/tests/ethload.sh
@@ -18,7 +18,7 @@ t() {
 
 
 
-PLOT_CMD='
+p() { cat <<EOF
 set title "Round-trip time with receive ethernet load"
 set logscale y
 set grid
@@ -28,5 +28,5 @@ plot [0:] "socketcan-norm-1000.dat" with lp lt 1 title "Socketcan",\
           "lincan-norm-1000.dat" with lp lt 2 title "Lincan",\
           "socketcan-boost-1000.dat" with lp lt 1 title "Socketcan boosted IRQ prio",\
           "lincan-boost-1000.dat" with lp lt 2 title "Lincan boosted IRQ prio"
-'
-
+EOF
+}
diff --git a/tests/ethloadsend.sh b/tests/ethloadsend.sh
index 8a9fc16..0c3f739 100755
--- a/tests/ethloadsend.sh
+++ b/tests/ethloadsend.sh
@@ -13,7 +13,7 @@ t() {
 
 
 
-PLOT_CMD='
+p() { cat <<EOF
 set title "Round-trip time with send ethernet load"
 set logscale y
 set grid
@@ -21,5 +21,5 @@ 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"
-'
-
+EOF
+}
diff --git a/tests/rtt-virtual.sh b/tests/rtt-virtual.sh
index cf8cca4..1762d33 100755
--- a/tests/rtt-virtual.sh
+++ b/tests/rtt-virtual.sh
@@ -10,7 +10,7 @@ t() {
 
 TESTS="lincan_virtual socketcan_virtual"
 
-PLOT_CMD='
+p() { cat <<EOF
 set title "Round-trip time - virtual CAN"
 set logscale y
 set grid
@@ -18,5 +18,5 @@ 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"
-'
-
+EOF
+}
diff --git a/tests/rtt-w.sh b/tests/rtt-w.sh
index a91308b..accca40 100755
--- a/tests/rtt-w.sh
+++ b/tests/rtt-w.sh
@@ -12,7 +12,7 @@ t() {
 
 
 
-PLOT_CMD='
+p() { cat <<EOF
 set title "Round-trip time depending on delay between sends"
 set logscale y
 set grid
@@ -24,4 +24,5 @@ plot [0:] "socketcan-0-1000.dat" with lp lt 1 title "Socketcan 0",\
           "lincan-1-1000.dat" with lp lt 2 title "Lincan 1",\
           "socketcan-2-1000.dat" with lp lt 1 title "Socketcan 2",\
           "lincan-2-1000.dat" with lp lt 2 title  "Lincan 2"
-'
+EOF
+}
diff --git a/tests/rtt.sh b/tests/rtt.sh
index f0ce667..f79a06c 100755
--- a/tests/rtt.sh
+++ b/tests/rtt.sh
@@ -10,7 +10,7 @@ t() {
 
 
 
-PLOT_CMD='
+p() { cat <<EOF
 set title "Round-trip time"
 set logscale y
 set grid
@@ -18,7 +18,8 @@ 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"
-'
+EOF
+}
 
 PLOT_CMD[1]='
 set title "Round-trip time history"
-- 
2.39.2