From b22ced2ef08caf776b2edc6007d77638d2615d13 Mon Sep 17 00:00:00 2001 From: Fredrik Osterlind Date: Wed, 30 May 2012 15:09:20 +0200 Subject: [PATCH] using example-specific connect-router-cooja target, to automatically build dependencies (e.g. tunslip6) --- tools/cooja/contiki_tests/rest_rpl_coap.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cooja/contiki_tests/rest_rpl_coap.js b/tools/cooja/contiki_tests/rest_rpl_coap.js index cfb57065f..c98dfb2aa 100644 --- a/tools/cooja/contiki_tests/rest_rpl_coap.js +++ b/tools/cooja/contiki_tests/rest_rpl_coap.js @@ -5,7 +5,7 @@ ADDRESS_ROUTER = "aaaa::212:7401:1:101"; ADDRESS_SERVER = "aaaa::212:7402:2:202"; NR_PINGS = 10; CMD_PING_PREFIX = "ping6 -c " + NR_PINGS + " -I tun0 "; -CMD_TUNNEL = "./tunslip6 -a 127.0.0.1 aaaa::1/64"; // "make connect-router-cooja"; +CMD_TUNNEL = "make connect-router-cooja"; CMD_WGET_ROUTER = "wget -t 1 -T 10 -O - http:\/\/[" + ADDRESS_ROUTER + "]"; CMD_WGET_SERVER = "wget -t 1 -T 10 -O - http:\/\/[" + ADDRESS_SERVER + "]"; COAP_SAMPLECLIENT_JAR = "/home/user/Californium/ExampleClient.jar"; @@ -21,7 +21,7 @@ sim.setDelayTime(java.lang.Integer.MIN_VALUE); /* create tunnel interface */ log.log("create tunnel interface\n"); launcher = new java.lang.ProcessBuilder["(java.lang.String[])"](['sh','-c',CMD_TUNNEL]); -launcher.directory(new java.io.File("../../../tools")); +launcher.directory(new java.io.File("../../../examples/er-rest-example")); launcher.redirectErrorStream(true); tunProcess = launcher.start(); tunRunnable = new Object();