riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9947 from bergzand/pr/tinycbor/v052

Browse Source 
tinycbor: Version bump to 0.5.2
This commit is contained in:
Martine Lenders 2018-09-29 22:30:46 +02:00 committed by GitHub
commit b78f78d3a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/tinycbor/Makefile
View File

@ -1,6 +1,7 @@
PKG_NAME=tinycbor PKG_NAME=tinycbor
PKG_URL=https://github.com/intel/tinycbor PKG_URL=https://github.com/intel/tinycbor
PKG_VERSION=v0.5.1 # Tinycbor v0.5.2
PKG_VERSION=d94ca09aa91f5b3c581527aa8bca179a82b79874
PKG_LICENSE=MIT PKG_LICENSE=MIT
.PHONY: all .PHONY: all

7
pkg/tinycbor/Makefile.include
View File

@ -1 +1,8 @@
INCLUDES += -I$(PKGDIRBASE)/tinycbor/src INCLUDES += -I$(PKGDIRBASE)/tinycbor/src
ifeq (,$(filter tinycbor_float,$(USEMODULE)))
CFLAGS += -DCBOR_NO_FLOATING_POINT
endif
# Declare pseudomodules here to be selfcontained
PSEUDOMODULES += tinycbor_%

2
tests/pkg_tinycbor/Makefile
View File

@ -9,5 +9,7 @@ USEMODULE += embunit
USEMODULE += fmt USEMODULE += fmt
USEPKG += tinycbor USEPKG += tinycbor
USEMODULE += tinycbor_float
TEST_ON_CI_WHITELIST += all TEST_ON_CI_WHITELIST += all
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/pkg_tinycbor/main.c
View File

@ -52,6 +52,7 @@ const char *tests[] = {
"f7", /* undefined */ "f7", /* undefined */
"f8ff", /* simple(255) */ "f8ff", /* simple(255) */
#ifdef MODULE_TINYCBOR_FLOAT
"f93c00", /* 1.0 */ "f93c00", /* 1.0 */
"f9bc00", /* -1.0 */ "f9bc00", /* -1.0 */
"f903ff", /* 6.097555160522461e-05 */ "f903ff", /* 6.097555160522461e-05 */
@ -61,6 +62,7 @@ const char *tests[] = {
"fa47800000", /* 65536.0 */ "fa47800000", /* 65536.0 */
"fb3ff199999999999a", /* 1.1 */ "fb3ff199999999999a", /* 1.1 */
"f97e00", /* NaN */ "f97e00", /* NaN */
#endif
"8300810000", /* [ 0, [ 0], 0] */ "8300810000", /* [ 0, [ 0], 0] */
"a26161016162820203", /* { "a": 1, "b": [ 2, 3]} */ "a26161016162820203", /* { "a": 1, "b": [ 2, 3]} */