From 710ea91f1afb88d2a32dc0b69df7690cbfa30585 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Tue, 27 Mar 2018 16:11:57 +0200 Subject: [PATCH 1/2] Compile test log summary format --- tests/Makefile.compile-test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.compile-test b/tests/Makefile.compile-test index 6c7df5835..1a5952033 100644 --- a/tests/Makefile.compile-test +++ b/tests/Makefile.compile-test @@ -42,8 +42,8 @@ define dooneexample @((cd $(EXAMPLESDIR)/$(1); \ make $(4) TARGET=$(2) clean && make -j $(4) TARGET=$(2) WERROR=1) > \ /dev/null 2>make.err && \ - (echo " -> OK" && printf "%-75s %-35s %-20s TEST OK\n" "$(1)" "$(4)" "$(2)" > $(3)-$(subst /,-,$(1))$(2).testlog) || \ - (echo " -> FAIL" && printf "%-75s %-35s %-20s TEST FAIL\n" "$(1)" "$(4)" "$(2)" > $(3)-$(subst /,-,$(1))$(2).testlog ; cat make.err)) + (echo " -> OK" && printf "%-75s %-40s %-20s TEST OK\n" "$(1)" "$(4)" "$(2)" > $(3)-$(subst /,-,$(1))$(2).testlog) || \ + (echo " -> FAIL" && printf "%-75s %-40s %-20s TEST FAIL\n" "$(1)" "$(4)" "$(2)" > $(3)-$(subst /,-,$(1))$(2).testlog ; cat make.err)) @rm -f make.err endef From 4206761ccff8a5410f426c86cc3e785c0c08f1e9 Mon Sep 17 00:00:00 2001 From: Yasuyuki Tanaka Date: Mon, 26 Mar 2018 20:51:30 +0200 Subject: [PATCH 2/2] shell: add missing UIP_CONF_IPV6_RPL guard --- os/services/shell/shell-commands.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/os/services/shell/shell-commands.c b/os/services/shell/shell-commands.c index dd4fb95dc..f8ff63660 100644 --- a/os/services/shell/shell-commands.c +++ b/os/services/shell/shell-commands.c @@ -337,6 +337,7 @@ PT_THREAD(cmd_help(struct pt *pt, shell_output_func output, char *args)) PT_END(pt); } +#if UIP_CONF_IPV6_RPL /*---------------------------------------------------------------------------*/ static PT_THREAD(cmd_rpl_set_root(struct pt *pt, shell_output_func output, char *args)) @@ -415,6 +416,7 @@ PT_THREAD(cmd_rpl_local_repair(struct pt *pt, shell_output_func output, char *ar PT_END(pt); } +#endif /* UIP_CONF_IPV6_RPL */ /*---------------------------------------------------------------------------*/ static PT_THREAD(cmd_ipaddr(struct pt *pt, shell_output_func output, char *args))