]> rtime.felk.cvut.cz Git - can-benchmark.git/commitdiff
projects / can-benchmark.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f327c4a)
Small fixes in graphs
authorMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 28 Aug 2009 07:29:26 +0000 (09:29 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 28 Aug 2009 07:29:26 +0000 (09:29 +0200)
tests/Makefile patch | blob | history
tests/_lib.sh patch | blob | history
tests/genhtml.py patch | blob | history
tests/rtt-w.sh patch | blob | history

diff --git a/tests/Makefile b/tests/Makefile
index b333eb00060bf658827763d2e5a34f17bf4aa7c1..54bdd0f6507cf6b31aa3119f6a3e9228e1d88d05 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -4,8 +4,14 @@ T=$(filter-out _lib.sh,$(wildcard *.sh))
 
 all: $(T) html
 
 
 all: $(T) html
 
+TEST_FLAGS = -x
+
 $(T):%:
 $(T):%:
-       ./$@ -X
+       ./$@ $(TEST_FLAGS)
+
+.PHONY: plot
+plot:
+       $(MAKE) TEST_FLAGS="-p -X"
 
 .PHONY: html
 html:
 
 .PHONY: html
 html:
diff --git a/tests/_lib.sh b/tests/_lib.sh
index 4683be5546d938ac2125926488dbde6a7556341a..1474741a6c7289aee9dcd555698ab89af752aaea 100644 (file)
--- a/tests/_lib.sh
+++ b/tests/_lib.sh
@@ -104,7 +104,7 @@ plot() {
 #    for i in "${!PLOT_CMD[@]}"; do
     for i in 0; do
        cmd=`p`                 # Get plot commands
 #    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)'/")
+       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
        if [ -z "$OPT_NO_X11" ]; then
            echo "set terminal x11 enhanced; ${cmd}" | gnuplot -persist
        fi
diff --git a/tests/genhtml.py b/tests/genhtml.py
index 9e3263ef1333a95d166e530506a3544adf3466da..f6f55c58a4dcc6e1756fa79a0cac7534c066fa37 100755 (executable)
--- a/tests/genhtml.py
+++ b/tests/genhtml.py
@@ -69,7 +69,7 @@ td { border: 1px solid lightgray; padding: 4px;}
 <body>
 <h1>CAN driver benchmark for %s %s</h1>"""  % (self.name, self.value, self.name, self.value)
         for ps in pagesets:
 <body>
 <h1>CAN driver benchmark for %s %s</h1>"""  % (self.name, self.value, self.name, self.value)
         for ps in pagesets:
-            print >>html, "View by %s: " % str(ps.values)
+            print >>html, "View only %s: " % str(ps.values)
             for v in ps.values:
                 print >>html, "<a href='%s-%s.html'>%s</a> | "%(ps.values.type, v, v)
             print >>html, "<br>"
             for v in ps.values:
                 print >>html, "<a href='%s-%s.html'>%s</a> | "%(ps.values.type, v, v)
             print >>html, "<br>"
diff --git a/tests/rtt-w.sh b/tests/rtt-w.sh
index 7e908c3f0554e4147165ac32bb4ee084592026ac..5dcae1ad77fcf1116ff5d4bbaae01cc0f09a494e 100755 (executable)
--- a/tests/rtt-w.sh
+++ b/tests/rtt-w.sh
@@ -18,11 +18,11 @@ set logscale y
 set grid
 set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
 set grid
 set xlabel "Time [ms]"
 set ylabel "Latency profile [messages]"
-plot [0:] "socketcan-0-1000.dat" with lp lt 1 title "Socketcan 0",\
-          "lincan-0-1000.dat" with lp lt 2 title "Lincan 0",\
-          "socketcan-1-1000.dat" with lp lt 1 title "Socketcan 1",\
-          "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"
+plot [0:] "socketcan-0-1000.dat" with lp lt 1 title "Socketcan 0sms",\
+          "lincan-0-1000.dat" with lp lt 2 title "Lincan 0 ms",\
+          "socketcan-1-1000.dat" with lp lt 1 title "Socketcan 1 ms",\
+          "lincan-1-1000.dat" with lp lt 2 title "Lincan 1 ms",\
+          "socketcan-2-1000.dat" with lp lt 1 title "Socketcan 2 ms",\
+          "lincan-2-1000.dat" with lp lt 2 title  "Lincan 2 ms"
 EOF
 }
 EOF
 }
Unnamed repository; edit this file to name it for gitweb.