From f8c4d1155f675db1eb5e9544ed5444f670bcf216 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Sat, 23 Apr 2016 01:15:21 +0200 Subject: [PATCH 1/2] Disable RPL DAO ACK by default --- core/net/rpl/rpl-conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h index 6822ff550..b86a36a85 100644 --- a/core/net/rpl/rpl-conf.h +++ b/core/net/rpl/rpl-conf.h @@ -242,7 +242,7 @@ #ifdef RPL_CONF_WITH_DAO_ACK #define RPL_WITH_DAO_ACK RPL_CONF_WITH_DAO_ACK #else -#define RPL_WITH_DAO_ACK 1 +#define RPL_WITH_DAO_ACK 0 #endif /* RPL_CONF_WITH_DAO_ACK */ /* From 753a557903eca3bf09bdefc80bae4a7d5c08df99 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Sat, 23 Apr 2016 07:58:06 +0200 Subject: [PATCH 2/2] Travis: use a single random seed rather than two. As a result, a single failed simulation results in overall failure --- regression-tests/Makefile.simulation-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regression-tests/Makefile.simulation-test b/regression-tests/Makefile.simulation-test index 58818c328..9995eeea8 100644 --- a/regression-tests/Makefile.simulation-test +++ b/regression-tests/Makefile.simulation-test @@ -31,7 +31,7 @@ TESTLOGS=$(patsubst %.csc,%.testlog,$(TESTS)) LOGS=$(patsubst %.csc,%.log,$(TESTS)) FAILLOGS=$(patsubst %.csc,%.*.faillog,$(TESTS)) #Set random seeds to create reproduceable results. -RANDOMSEED=1 5 +RANDOMSEED=1 CONTIKI=../..