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

+ verifies the base64 encoded executable stored in flash

Browse source
This commit is contained in:
fros4943 2009-06-26 13:26:48 +00:00
parent 74ccc5a732
commit a4bc10edfa
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tools/cooja/contiki_tests/sky_shell_exec_serial.csc
View file

@ -112,15 +112,17 @@ YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
log.log("Uploading hello-world.b64:\n"); log.log("Uploading hello-world.b64:\n");
cmdarr = "sh -c xxx".split(" "); cmdarr = "sh -c xxx".split(" ");
cmdarr[2] = "../../tools/base64-encode < hello-world.ce"; cmdarr[2] = "../../tools/base64-encode < hello-world.ce";
sb = new java.lang.StringBuilder();
process = new java.lang.Runtime.getRuntime().exec(cmdarr, null, helloworld.getParentFile()); process = new java.lang.Runtime.getRuntime().exec(cmdarr, null, helloworld.getParentFile());
stdIn = new java.io.BufferedReader(new java.io.InputStreamReader(process.getInputStream())); stdIn = new java.io.BufferedReader(new java.io.InputStreamReader(process.getInputStream()));
while ((line = stdIn.readLine()) != null) { while ((line = stdIn.readLine()) != null) {
write(mote, line + "\n"); write(mote, line + "\n");
sb.append(line);
YIELD(); YIELD();
if (msg.startsWith(line)) { if (msg.startsWith(line)) {
log.log("UPLOADED: " + line + "\n"); log.log("UPLOADED: " + msg + "\n");
} else { } else {
log.log("Serial port upload failed:\n" + line + "\n" + msg + "\n"); log.log("Serial port upload failed:\n" + line + "\n" + msg + "\n");
log.testFailed(); log.testFailed();
@ -133,6 +135,28 @@ write(mote, "~K\n");
GENERATE_MSG(500, "continue"); GENERATE_MSG(500, "continue");
YIELD_THEN_WAIT_UNTIL(msg.equals("continue")); YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
log.log("Reading and verifying hello-world.b64 from flash\n");
write(mote, "read hello-world.b64");
YIELD();
while (!msg.contains("Contiki>")) {
if (!sb.toString().startsWith(msg.trim())) {
log.log("Verify failed: '" + msg + "' does not start '" + sb.toString() + "'\n");
log.testFailed();
} else {
log.log("VERIFIED: " + msg + "\n");
sb.replace(0, msg.length()-1, new String(""));
}
YIELD();
}
if (sb.length()>0) {
log.log("Verify failed: remaining buffer: " + sb);
log.testFailed();
}
GENERATE_MSG(500, "continue");
YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
log.log("Converting base64 to binary hello-world.ce\n"); log.log("Converting base64 to binary hello-world.ce\n");
write(mote, "read hello-world.b64 | dec64 | write hello-world.ce | null"); write(mote, "read hello-world.b64 | dec64 | write hello-world.ce | null");
GENERATE_MSG(3000, "continue"); GENERATE_MSG(3000, "continue");