From 91ca67d3936d230fca07b1c2560ac38fbad35b3e Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Tue, 19 Dec 2017 09:50:03 -0800 Subject: [PATCH] CI: minor printout fix --- .../Makefile.rpl-border-router | 10 ++++++ os/services/rpl-border-router/module-macros.h | 31 +++++++++++++++++++ tests/17-tun-rpl-br/06-native-coap.sh | 2 +- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 os/services/rpl-border-router/Makefile.rpl-border-router create mode 100644 os/services/rpl-border-router/module-macros.h diff --git a/os/services/rpl-border-router/Makefile.rpl-border-router b/os/services/rpl-border-router/Makefile.rpl-border-router new file mode 100644 index 000000000..f1f28e096 --- /dev/null +++ b/os/services/rpl-border-router/Makefile.rpl-border-router @@ -0,0 +1,10 @@ +CFLAGS += -DBUILD_WITH_RPL_BORDER_ROUTER=1 + +include $(CONTIKI)/Makefile.identify-target + +# Include 'embedded' module for non-native platforms +ifneq ($(TARGET),native) + MODULES += os/services/rpl-border-router/embedded +endif +# Include optional target-specific module +MODULES += os/services/rpl-border-router/$(TARGET) diff --git a/os/services/rpl-border-router/module-macros.h b/os/services/rpl-border-router/module-macros.h new file mode 100644 index 000000000..2f2a8306c --- /dev/null +++ b/os/services/rpl-border-router/module-macros.h @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2017, RISE SICS + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#define UIP_FALLBACK_INTERFACE rpl_interface diff --git a/tests/17-tun-rpl-br/06-native-coap.sh b/tests/17-tun-rpl-br/06-native-coap.sh index a42424ee4..453d76e2e 100755 --- a/tests/17-tun-rpl-br/06-native-coap.sh +++ b/tests/17-tun-rpl-br/06-native-coap.sh @@ -44,7 +44,7 @@ sleep 2 pgrep hello-world | sudo xargs kill -9 if [ $TESTCOUNT -eq $OKCOUNT ] ; then - printf "%-40s TEST OK %3d/%d\n" "$BASENAME" "$OKCOUNT" "$TESTCOUNT" > $BASENAME.testlog; + printf "%-32s TEST OK %3d/%d\n" "$BASENAME" "$OKCOUNT" "$TESTCOUNT" > $BASENAME.testlog; else echo "==== make.log ====" ; cat make.log; echo "==== make.err ====" ; cat make.err;