mynewt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccoll...@apache.org
Subject incubator-mynewt-larva git commit: Fix shell and console dependencies for tests.
Date Tue, 17 Nov 2015 19:27:41 GMT
Repository: incubator-mynewt-larva
Updated Branches:
  refs/heads/master e96c2c3c6 -> c01ab4c7c


Fix shell and console dependencies for tests.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/c01ab4c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/c01ab4c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/c01ab4c7

Branch: refs/heads/master
Commit: c01ab4c7c1dc0d23b4dc54b9c66beeada988ce61
Parents: e96c2c3
Author: Christopher Collins <ccollins476ad@gmail.com>
Authored: Tue Nov 17 11:27:26 2015 -0800
Committer: Christopher Collins <ccollins476ad@gmail.com>
Committed: Tue Nov 17 11:27:26 2015 -0800

----------------------------------------------------------------------
 libs/os/egg.yml       | 3 +++
 libs/os/src/os_info.c | 2 ++
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/c01ab4c7/libs/os/egg.yml
----------------------------------------------------------------------
diff --git a/libs/os/egg.yml b/libs/os/egg.yml
index dd2657f..709d1a3 100644
--- a/libs/os/egg.yml
+++ b/libs/os/egg.yml
@@ -9,3 +9,6 @@ egg.deps.SHELL:
     - libs/console/full 
     - libs/shell 
 egg.cflags.SHELL: -DSHELL_PRESENT 
+
+# Satisfy capability dependencies for the self-contained test executable.
+egg.deps.test: libs/console/stub

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/c01ab4c7/libs/os/src/os_info.c
----------------------------------------------------------------------
diff --git a/libs/os/src/os_info.c b/libs/os/src/os_info.c
index dde779d..06e7131 100644
--- a/libs/os/src/os_info.c
+++ b/libs/os/src/os_info.c
@@ -19,7 +19,9 @@
 #include "os/queue.h"
 
 #include "console/console.h"
+#ifdef SHELL_PRESENT
 #include "shell/shell.h" 
+#endif
 
 #include <string.h>
 


Mime
View raw message