Merge pull request #1621 from simonduq/pr/fix-travis-output

Fix output of RPL tests

regression-tests/12-rpl/01-rpl-up-route.csc

@@ -315,22 +315,20 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
-//        log.log("Num " + num + "\n");
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>

regression-tests/12-rpl/02-rpl-root-reboot.csc

@@ -315,22 +315,20 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
-//        log.log("Num " + num + "\n");
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>

regression-tests/12-rpl/03-rpl-28-hours.csc

@@ -264,22 +264,20 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
-//        log.log("Num " + num + "\n");
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>

regression-tests/12-rpl/04-rpl-large-network.csc

@@ -7030,22 +7030,20 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
-//        log.log("Num " + num + "\n");
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>

regression-tests/12-rpl/05-rpl-up-and-down-routes.csc

@@ -313,22 +313,20 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
-//        log.log("Num " + num + "\n");
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>

regression-tests/12-rpl/06-rpl-temporary-root-loss.csc

@@ -318,23 +318,21 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
-//        log.log("Num " + num + "\n");
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             lastMissed = num;
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>

regression-tests/12-rpl/08-rpl-dao-route-loss-0.csc

@@ -330,23 +330,21 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
         seenMsgs++;
-//        log.log("Num " + num + "\n");
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>

regression-tests/12-rpl/08-rpl-dao-route-loss-1.csc

@@ -330,23 +330,21 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
         seenMsgs++;
-//        log.log("Num " + num + "\n");
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>

regression-tests/12-rpl/08-rpl-dao-route-loss-2.csc

@@ -330,23 +330,21 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
         seenMsgs++;
-//        log.log("Num " + num + "\n");
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>

regression-tests/12-rpl/08-rpl-dao-route-loss-3.csc

@@ -330,23 +330,21 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
         seenMsgs++;
-//        log.log("Num " + num + "\n");
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>

regression-tests/12-rpl/08-rpl-dao-route-loss-4.csc

@@ -330,23 +330,21 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
         seenMsgs++;
-//        log.log("Num " + num + "\n");
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>

regression-tests/12-rpl/08-rpl-dao-route-loss-5.csc

@@ -330,23 +330,21 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
         seenMsgs++;
-//        log.log("Num " + num + "\n");
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>

regression-tests/12-rpl/09-rpl-probing.csc

@@ -226,23 +226,21 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
-//        log.log("Num " + num + "\n");
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
         lastMsgHops = hops;
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>

regression-tests/12-rpl/10-rpl-multi-dodag.csc

@@ -356,12 +356,8 @@ while(true) {
     } else if(msg.startsWith("#L") && msg.endsWith("1; red")) {
         hops++;
     } else if(msg.startsWith("Data")) {
-//        log.log("" + msg + "\n");    
         data = msg.split(" ");
         num = parseInt(data[14]);
-        packets = packets.substr(0, num) + "*";
-        log.log("" + hops + " " + packets + "\n");
-//        log.log("Num " + num + "\n");
         if(newSink) {
           newDagOk++;
           newSink = 0;
@@ -369,13 +365,15 @@ while(true) {
         if(lastMsg != -1) {
           if(num != lastMsg + 1) {
             numMissed = num - lastMsg - 1;
-            lostMsgs += numMissed;
+            lostMsgs += numMissed;           
             log.log("Missed messages " + numMissed + " before " + num + "\n");            
             for(i = 0; i < numMissed; i++) {
-                packets = packets.substr(0, lastMsg + i) + "_";    
+                packets = packets.substr(0, lastMsg + i + 1) + "_";    
             }
           }    
         }
+        packets = packets.substr(0, num) + "*";
+        log.log("" + hops + " " + packets + "\n");
         lastMsg = num;
     }
 }</script>