From 445d6b6a720674a6dafdc1e638fe81c1e54b6e0b Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Sat, 14 Nov 2009 11:52:03 +0000
Subject: [PATCH] test script bug fix: serial writes to motes should not
 include a newline. the additional newline character was earlier (wrongly)
 dropped by the serial line module, but is now handled by the ringbuf-based
 serial line implementation

---
 .../contiki_tests/sky_shell_exec_serial.csc      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tools/cooja/contiki_tests/sky_shell_exec_serial.csc b/tools/cooja/contiki_tests/sky_shell_exec_serial.csc
index 65d5700a4..964c97333 100644
--- a/tools/cooja/contiki_tests/sky_shell_exec_serial.csc
+++ b/tools/cooja/contiki_tests/sky_shell_exec_serial.csc
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
-  <project>../apps/mrm</project>
-  <project>../apps/mspsim</project>
-  <project>../apps/avrora</project>
-  <project>../apps/native_gateway</project>
+  <project>[CONTIKI_DIR]/tools/cooja/apps/mrm</project>
+  <project>[CONTIKI_DIR]/tools/cooja/apps/mspsim</project>
+  <project>[CONTIKI_DIR]/tools/cooja/apps/avrora</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -16,11 +15,14 @@
       <success_ratio_tx>1.0</success_ratio_tx>
       <success_ratio_rx>1.0</success_ratio_rx>
     </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
     <motetype>
       se.sics.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>Sky Mote Type #sky1</description>
-      <source>../../../examples/sky-shell-exec/sky-shell-exec.c</source>
+      <source>[CONTIKI_DIR]/examples/sky-shell-exec/sky-shell-exec.c</source>
       <commands>echo CLEANING
 make clean TARGET=sky
 
@@ -33,7 +35,7 @@ make sky-shell-exec.sky CORE=sky-shell-exec.sky TARGET=sky
 make sky-shell-exec.sky CORE=sky-shell-exec.sky TARGET=sky
 make sky-shell-exec.sky CORE=sky-shell-exec.sky TARGET=sky
 make sky-shell-exec.sky CORE=sky-shell-exec.sky TARGET=sky</commands>
-      <firmware>../../../examples/sky-shell-exec/sky-shell-exec.sky</firmware>
+      <firmware>[CONTIKI_DIR]/examples/sky-shell-exec/sky-shell-exec.sky</firmware>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
@@ -121,7 +123,7 @@ sb = new java.lang.StringBuilder();
 process = new java.lang.Runtime.getRuntime().exec(cmdarr, null, helloworld.getParentFile());
 stdIn = new java.io.BufferedReader(new java.io.InputStreamReader(process.getInputStream()));
 while ((line = stdIn.readLine()) != null) {
-  write(mote, line + "\n");
+  write(mote, line);
   sb.append(line);
 
   YIELD();