updated test to transfer files over a multihop link, to use NULLMAC, and to clean before and after building the sources

NULLMAC is used mainly to reserve ROM

tools/cooja/contiki_tests/ip_sky_webserver_wget.csc

@@ -18,15 +18,15 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/sky-shell-webserver/sky-shell-webserver.c</source>
-      <command>make sky-shell-webserver.sky TARGET=sky</command>
+      <command>bash -c 'make clean TARGET=sky &amp;&amp; make sky-shell-webserver.sky TARGET=sky DEFINES=WITH_NULLMAC &amp;&amp; make clean TARGET=sky'</command>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
       <motetype_identifier>sky1</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
-        <x>67.00582793711605</x>
+        <x>16.08449565170202</x>
-        <y>61.11208446062922</y>
+        <y>26.59851562245121</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
@@ -53,8 +53,8 @@
       <motetype_identifier>sky1</motetype_identifier>
       <interface_config>
         se.sics.cooja.interfaces.Position
-        <x>17.479600645822952</x>
+        <x>70.00470747576063</x>
-        <y>16.52364251581611</y>
+        <y>60.92771287468932</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
@@ -86,52 +86,39 @@
     <location_y>0</location_y>
     <minimized>false</minimized>
   </plugin>
-  <plugin>
-    se.sics.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-      <history>256</history>
-    </plugin_config>
-    <width>998</width>
-    <z>4</z>
-    <height>166</height>
-    <location_x>0</location_x>
-    <location_y>704</location_y>
-    <minimized>false</minimized>
-  </plugin>
   <plugin>
     se.sics.cooja.radiomediums.UDGM$VisUDGM
-    <width>300</width>
+    <width>435</width>
-    <z>3</z>
+    <z>4</z>
-    <height>169</height>
+    <height>195</height>
-    <location_x>693</location_x>
+    <location_x>255</location_x>
     <location_y>6</location_y>
     <minimized>false</minimized>
   </plugin>
-  <plugin>
-    se.sics.cooja.plugins.MoteInterfaceViewer
-    <mote_arg>2</mote_arg>
-    <plugin_config>
-      <interface>Serial port</interface>
-    </plugin_config>
-    <width>758</width>
-    <z>5</z>
-    <height>245</height>
-    <location_x>2</location_x>
-    <location_y>202</location_y>
-    <minimized>false</minimized>
-  </plugin>
   <plugin>
     se.sics.cooja.plugins.MoteInterfaceViewer
     <mote_arg>3</mote_arg>
     <plugin_config>
       <interface>Serial port</interface>
     </plugin_config>
-    <width>683</width>
+    <width>684</width>
+    <z>3</z>
+    <height>324</height>
+    <location_x>10</location_x>
+    <location_y>547</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.MoteInterfaceViewer
+    <mote_arg>0</mote_arg>
+    <plugin_config>
+      <interface>Serial port</interface>
+    </plugin_config>
+    <width>682</width>
     <z>2</z>
-    <height>244</height>
+    <height>334</height>
-    <location_x>312</location_x>
+    <location_x>10</location_x>
-    <location_y>452</location_y>
+    <location_y>207</location_y>
     <minimized>false</minimized>
   </plugin>
 </simconf>

tools/cooja/contiki_tests/ip_sky_webserver_wget.info

@@ -1 +1 @@
-Four Sky nodes running both the shell and a CFS webserver. Test uses shell commands write and wget to generate and transfer files.
+Four Sky nodes running both the shell and a CFS webserver. Test uses shell commands echo, write, append and wget to generate and transfer files over a multi-hop link. Test uses NULLMAC-

tools/cooja/contiki_tests/ip_sky_webserver_wget.js

@@ -2,31 +2,45 @@ TIMEOUT(90000, log.log("last message: " + msg + "\n"));
 
 mote1 = null;
 mote4 = null;
+nr_boot = 0;
 
-/* Wait until both node 1 and 4 have booted */
+/* Wait until all nodes have booted */
 while (true) {
   if (msg.contains('Starting')) {
+    nr_boot++;
     if (id == 1) mote1 = mote;
     if (id == 4) mote4 = mote;
   }
-  if (mote1 != null && mote4 != null) break;
+  if (nr_boot == 4) break;
   YIELD();
 }
-log.log("Mote 1 and mote 4 booted\n");
+log.log("All motes booted\n");
 
 /* Wait one second */
 GENERATE_MSG(1000, "continue");
 WAIT_UNTIL(msg.equals("continue"));
 
 /* Create file on node 1 */
-log.log("Creating data on node 1\n");
+log.log("Node 1 creating data\n");
-write(mote1, "echo data generated at node 1 | write node1file.txt\n");
+write(mote1, "echo FROM1 | write node1file.txt\n");
 
-/* Fetch file to node 2 */
+/* Download node1file.txt to node 4 */
-log.log("Fetching data to node 4\n");
+log.log("Node 4 downloading from node 1\n");
-write(mote4, "wget 172.16.1.0/node1file.txt | write node2file.txt\n");
+write(mote4, "wget 172.16.1.0/node1file.txt | write node4file.txt\n");
+WAIT_UNTIL(id == 4 && msg.contains("FROM1"));
 
-WAIT_UNTIL(id == 4 && msg.contains("data generated at node 1"));
+/* Wait one second */
-log.log("Node 4 received data!\n");
+GENERATE_MSG(1000, "continue");
+WAIT_UNTIL(msg.equals("continue"));
+
+/* Extend data */
+log.log("Node 4 appending data\n");
+write(mote4, "echo FROM4 | append node4file.txt\n");
+
+/* Download node2file.txt at node 1 */
+log.log("Node 1 downloading from node 4\n");
+write(mote1, "wget 172.16.4.0/node4file.txt\n");
+
+WAIT_UNTIL(id == 1 && msg.contains("FROM4"));
 
 log.testOK();