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 e27a68277d7d08c25abb84e1814b8416a7bc3a92..f31fd55ffb1cccb532aee49e6d03844a9fcfd14f 100755 (executable)
--- 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
     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
 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
 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
 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();
 
 my $status = system((qw(ssh -T glab), $latester));
 $exp->close();