From 5e62a0dd2006ebb18d45f6b80e87371b2a1745d0 Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Thu, 4 Feb 2010 08:02:09 +0000 Subject: [PATCH] Bugfix: the cxmac and lpp netperf tests didn't actually run cxmac and lpp --- tools/cooja/contiki_tests/netperf-sky-cxmac.csc | 2 +- tools/cooja/contiki_tests/netperf-sky-lpp.csc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/cooja/contiki_tests/netperf-sky-cxmac.csc b/tools/cooja/contiki_tests/netperf-sky-cxmac.csc index bfd428f30..ed959c05f 100644 --- a/tools/cooja/contiki_tests/netperf-sky-cxmac.csc +++ b/tools/cooja/contiki_tests/netperf-sky-cxmac.csc @@ -25,7 +25,7 @@ netperf shell [CONTIKI_DIR]/examples/netperf/netperf-shell.c make clean TARGET=sky -make MAC_DRIVER=cxmac_driver netperf-shell.sky TARGET=sky +make DEFINES=MAC_DRIVER=cxmac_driver netperf-shell.sky TARGET=sky [CONTIKI_DIR]/examples/netperf/netperf-shell.sky se.sics.cooja.interfaces.Position se.sics.cooja.interfaces.RimeAddress diff --git a/tools/cooja/contiki_tests/netperf-sky-lpp.csc b/tools/cooja/contiki_tests/netperf-sky-lpp.csc index 1479f2857..e5bf04e35 100644 --- a/tools/cooja/contiki_tests/netperf-sky-lpp.csc +++ b/tools/cooja/contiki_tests/netperf-sky-lpp.csc @@ -25,7 +25,7 @@ netperf shell [CONTIKI_DIR]/examples/netperf/netperf-shell.c make clean TARGET=sky -make MAC_DRIVER=lpp_driver netperf-shell.sky TARGET=sky +make DEFINES=MAC_DRIVER=lpp_driver netperf-shell.sky TARGET=sky [CONTIKI_DIR]/examples/netperf/netperf-shell.sky se.sics.cooja.interfaces.Position se.sics.cooja.interfaces.RimeAddress @@ -125,7 +125,7 @@ while(true) { log.testFailed(); } if(id == 1 && msg.startsWith("1.0: Contiki") && 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; } }