Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop e343a7bbd -> 04e63de21
MYNEWT-563 Fix compilation errors when adding newtmgr to bletiny
1) Added #ifndef around #define STR(x) in bletiny/src/main.c
to avoid duplicate define when including <mgmt/mgmt.h> to
enable Newt Manager. Both defines are the same.
2) Added test/testutil package to test/runtest pkg.deps to fix
"testutil/testutil.h" not found error in runtest_nmgr.c.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/79ea96a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/79ea96a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/79ea96a8
Branch: refs/heads/develop
Commit: 79ea96a8468f7a1047011b62629f38c64d8ca200
Parents: 0fc206f
Author: Wanda <[email protected]>
Authored: Wed Jan 25 18:49:30 2017 -0800
Committer: cwanda <[email protected]>
Committed: Wed Jan 25 21:44:23 2017 -0800
----------------------------------------------------------------------
apps/bletiny/src/main.c | 3 +++
test/runtest/pkg.yml | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/79ea96a8/apps/bletiny/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/main.c b/apps/bletiny/src/main.c
index b0ed15d..dd83a27 100755
--- a/apps/bletiny/src/main.c
+++ b/apps/bletiny/src/main.c
@@ -97,7 +97,10 @@ static struct bletiny_tx_data_s bletiny_tx_data;
int bletiny_full_disc_prev_chr_val;
#define XSTR(s) STR(s)
+#ifndef STR
#define STR(s) #s
+#endif
+
#ifdef DEVICE_NAME
#define BLETINY_AUTO_DEVICE_NAME XSTR(DEVICE_NAME)
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/79ea96a8/test/runtest/pkg.yml
----------------------------------------------------------------------
diff --git a/test/runtest/pkg.yml b/test/runtest/pkg.yml
index 5919270..ad7ab1f 100644
--- a/test/runtest/pkg.yml
+++ b/test/runtest/pkg.yml
@@ -28,9 +28,8 @@ pkg.req_apis.RUNTEST_CLI:
- console
pkg.deps.RUNTEST_NEWTMGR:
- mgmt/mgmt
-
-pkg.deps.RUNTEST_NEWTMGR:
- encoding/json
+ - test/testutil
pkg.init:
runtest_init: 500
