From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Sat, 18 Dec 2010 20:24:30 +0000 (+0100)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
X-Git-Tag: fix-allnoconfig~199
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/60147f0ea81bf6410f17baf2ca2705f470fd32d5?hp=882d538840581ccf2a378e69d7965a53f60eb9cb

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

diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 1990302..fd5940c 100755
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -154,7 +154,7 @@ class Test(object):
             print >>file, "<a href='%s/results.html'><img src='%s/%s'></a>" % \
                   (urllib.quote(self.path), urllib.quote(self.path), img)
     def fullImgLink(self, pngName):
-        if os.environ['NO_PDF']:
+        if 'NO_PDF' in os.environ:
             return "<div><img src='%s' /></div>" % pngName
         else:
             return "<div><a href='%s'><img src='%s' /></a></div>" % \
diff --git a/gw-tests/vcan.sh b/gw-tests/vcan.sh
index c87ebaf..5a14f5a 100755
--- a/gw-tests/vcan.sh
+++ b/gw-tests/vcan.sh
@@ -39,7 +39,7 @@ plot [$range] [1:$COUNT] \\
 EOF
     lt=2
     for i in $numjobs; do
-	echo_plot "\"hops$i-hist.txt\" with lp lt $lt title \"$((i+2)) GW jobs, 1 vcan\""
+	echo_plot "\"hops$i-hist.txt\" with lp lt $lt pt $lt title \"$((i+2)) GW jobs, 1 vcan\""
         lt=$((lt+1))
     done
 }