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

Merge pull request #1660 from yatch/pr-fix-wpcapslip-path

Browse source 
Fix the path for wpcapslip in testscript for Instant Contiki
This commit is contained in:
Nicolas Tsiftes 2016-05-19 13:14:18 +02:00
parent c5bea81bb6 633bf09f6d
commit 366231f601
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
regression-tests/20-ip64/01-cooja-ip64-http-socket.csc
View file

@ -151,7 +151,7 @@ if (travis == null) {
/* Instant Contiki */
 /* Instant Contiki */
CMD_TUNNEL = "echo '-vj' > ~/.slirprc && make Connect.class && java Connect 'nc localhost 60001' 'script -t -f -c slirp'";
 CMD_TUNNEL = "echo '-vj' > ~/.slirprc && make Connect.class && java Connect 'nc localhost 60001' 'script -t -f -c slirp'";
CMD_PING = "ping -c 5 8.8.8.8";
 CMD_PING = "ping -c 5 8.8.8.8";
CMD_DIR = "../../wpcapslip";
 CMD_DIR = "../../tools/wpcapslip";
} else {
 } else {
/* Travis */
 /* Travis */
CMD_TUNNEL = "cd $TRAVIS_BUILD_DIR/tools/wpcapslip && sudo apt-get install slirp && echo '-vj' > ~/.slirprc && make Connect.class && java Connect 'nc localhost 60001' 'script -t -f -c slirp'";
 CMD_TUNNEL = "cd $TRAVIS_BUILD_DIR/tools/wpcapslip && sudo apt-get install slirp && echo '-vj' > ~/.slirprc && make Connect.class && java Connect 'nc localhost 60001' 'script -t -f -c slirp'";

2
regression-tests/21-large-rpl/testscript.js
View file

@ -9,7 +9,7 @@ if (travis == null) {
/* Instant Contiki */ /* Instant Contiki */
CMD_TUNNEL = "echo '-vj' > ~/.slirprc && make Connect.class && java Connect 'nc localhost 60001' 'script -t -f -c slirp'"; CMD_TUNNEL = "echo '-vj' > ~/.slirprc && make Connect.class && java Connect 'nc localhost 60001' 'script -t -f -c slirp'";
CMD_PING = "ping -c 5 8.8.8.8"; CMD_PING = "ping -c 5 8.8.8.8";
CMD_DIR = "../../wpcapslip"; CMD_DIR = "../../tools/wpcapslip";
} else { } else {
/* Travis */ /* Travis */
CMD_TUNNEL = "cd $TRAVIS_BUILD_DIR/tools/wpcapslip && sudo apt-get install slirp && echo '-vj' > ~/.slirprc && make Connect.class && java Connect 'nc localhost 60001' 'script -t -f -c slirp'"; CMD_TUNNEL = "cd $TRAVIS_BUILD_DIR/tools/wpcapslip && sudo apt-get install slirp && echo '-vj' > ~/.slirprc && make Connect.class && java Connect 'nc localhost 60001' 'script -t -f -c slirp'";