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

Bugfix: the cxmac and lpp netperf tests didn't actually run cxmac and lpp

Browse source
This commit is contained in:
adamdunkels 2010-02-04 08:02:09 +00:00
parent 511389ae09
commit 5e62a0dd20
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/cooja/contiki_tests/netperf-sky-cxmac.csc
View file

@ -25,7 +25,7 @@
<description>netperf shell</description> <description>netperf shell</description>
<source>[CONTIKI_DIR]/examples/netperf/netperf-shell.c</source> <source>[CONTIKI_DIR]/examples/netperf/netperf-shell.c</source>
<commands>make clean TARGET=sky <commands>make clean TARGET=sky
make MAC_DRIVER=cxmac_driver netperf-shell.sky TARGET=sky</commands> make DEFINES=MAC_DRIVER=cxmac_driver netperf-shell.sky TARGET=sky</commands>
<firmware>[CONTIKI_DIR]/examples/netperf/netperf-shell.sky</firmware> <firmware>[CONTIKI_DIR]/examples/netperf/netperf-shell.sky</firmware>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface> <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>

4
tools/cooja/contiki_tests/netperf-sky-lpp.csc
View file

@ -25,7 +25,7 @@
<description>netperf shell</description> <description>netperf shell</description>
<source>[CONTIKI_DIR]/examples/netperf/netperf-shell.c</source> <source>[CONTIKI_DIR]/examples/netperf/netperf-shell.c</source>
<commands>make clean TARGET=sky <commands>make clean TARGET=sky
make MAC_DRIVER=lpp_driver netperf-shell.sky TARGET=sky</commands> make DEFINES=MAC_DRIVER=lpp_driver netperf-shell.sky TARGET=sky</commands>
<firmware>[CONTIKI_DIR]/examples/netperf/netperf-shell.sky</firmware> <firmware>[CONTIKI_DIR]/examples/netperf/netperf-shell.sky</firmware>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface> <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
@ -125,7 +125,7 @@ while(true) {
log.testFailed(); log.testFailed();
} }
if(id == 1 &amp;&amp; msg.startsWith("1.0: Contiki") &amp;&amp; started == 0) { if(id == 1 &amp;&amp; msg.startsWith("1.0: Contiki") &amp;&amp; started == 0) {
write(mote, "netperf -bups 2.0 20\n"); /* Write to mote serial port */ write(mote, "netperf -ps 2.0 20\n"); /* Write to mote serial port */
started = 1; started = 1;
} }
} }