From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 6 Oct 2014 12:19:54 +0000 (+0200)
Subject: Improve run.pl
X-Git-Tag: pc-sw-update~15
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/12da9fdca7b5dd06ac65f9b8aeb349cac7811bb6?ds=sidebyside

Improve run.pl

- Syntax highlighting in editors now show latester related shell commands
- don't exit (due to set -e) if latester fails
---

diff --git a/continuous/gw-setup/run.pl b/continuous/gw-setup/run.pl
index e27a682..f31fd55 100755
--- a/continuous/gw-setup/run.pl
+++ b/continuous/gw-setup/run.pl
@@ -19,21 +19,20 @@ $exp->expect(120,
     or die("Boot failed");
 
 # Measure latencies
-my $latester=<<'EOF';
+my $latester = '
 set -e
 rm -f tmp-stat.txt
 echo "Starting latester"
 sudo /sbin/ifdown eth0
-sudo ~/bin/latester -d can0 -d can1 -d can2 -c 3200 -q --oneattime -n tmp
-r=$?
+r=0
+sudo ~/bin/latester -d can0 -d can1 -d can2 -c 3200 -q --oneattime -n tmp || r=$?
 sudo /sbin/ifup eth0
-set -e
 source tmp-stat.txt
 for i in sent lost enobufs $(seq -f percentile%g 0 10 100); do keyval="$keyval $i=$((i))"; done
 echo "! PERF: gw_latency $avg µs $keyval ok"
 test $avg -eq 0 && exit 1
 exit $r
-EOF
+';
 
 my $status = system((qw(ssh -T glab), $latester));
 $exp->close();