deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1647 from yatch/pr-rpl-regression-substr-fix

Browse source 
Resolve script errors raised during the RPL regression tests on Ubuntu 14.04
This commit is contained in:
Simon Duquennoy 2016-05-03 10:28:59 +02:00
parent 0e9234dce6 37b2d9f600
commit 896c58cd98
14 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
regression-tests/12-rpl/01-rpl-up-route.csc
View file

@ -323,11 +323,11 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}

4
regression-tests/12-rpl/02-rpl-root-reboot.csc
View file

@ -323,11 +323,11 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}

4
regression-tests/12-rpl/03-rpl-28-hours.csc
View file

@ -272,11 +272,11 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}

4
regression-tests/12-rpl/04-rpl-large-network.csc
View file

@ -7038,11 +7038,11 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}

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

@ -321,11 +321,11 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}

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

@ -327,11 +327,11 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}

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

@ -339,11 +339,11 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}

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

@ -339,11 +339,11 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}

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

@ -339,11 +339,11 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}

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

@ -339,11 +339,11 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}

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

@ -339,11 +339,11 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}

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

@ -339,11 +339,11 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}

4
regression-tests/12-rpl/09-rpl-probing.csc
View file

@ -234,12 +234,12 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
lastMsgHops = hops;
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}

4
regression-tests/12-rpl/10-rpl-multi-dodag.csc
View file

@ -368,11 +368,11 @@ while(true) {
lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
} 
}
packets = packets.substr(0, num) + "*";
packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
lastMsg = num;
}