ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Squashed 'features/frameworks/mbed-trace/' changes from 6d3590f..6df2572 

6df2572 add unit test support for mac (#81)

git-subtree-dir: features/frameworks/mbed-trace
git-subtree-split: 6df2572dfb803596049b87fbad4d761acaef69c3
pull/6876/head
Juhani Puurula 2018-05-11 09:55:48 +03:00
parent a5a8e95bd4
commit 7a58eaec9d
5 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -171,6 +171,13 @@ yotta target x86-linux-native
yotta test mbed_trace_test
```
* In Mac
```
yotta target x86-osx-native
yotta test mbed_trace_test
```
* In Windows
```

4
module.json
View File

@ -27,6 +27,10 @@
"cpputest": "ARMmbed/cpputest",
"nanostack-libservice": "^3.6.0"
},
"x86-osx-native": {
"cpputest": "ARMmbed/cpputest",
"nanostack-libservice": "^3.6.0"
},
"x86-windows-native": {
"cpputest": "ARMmbed/cpputest",
"nanostack-libservice": "^3.6.0"

6
source/CMakeLists.txt
View File

@ -4,6 +4,12 @@ if(DEFINED TARGET_LIKE_X86_LINUX_NATIVE)
)
add_definitions("-g -O0 -fprofile-arcs -ftest-coverage")
target_link_libraries(mbed-trace gcov nanostack-libservice)
elseif(DEFINED TARGET_LIKE_X86_OSX_NATIVE)
add_library( mbed-trace
mbed_trace.c
)
add_definitions("-g -O0")
target_link_libraries(mbed-trace nanostack-libservice)
else()
add_library( mbed-trace
mbed_trace.c

9
test/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# only build tests on targets that declare they are like posix
if(DEFINED TARGET_LIKE_X86_WINDOWS_NATIVE OR DEFINED TARGET_LIKE_X86_LINUX_NATIVE)
if(DEFINED TARGET_LIKE_X86_WINDOWS_NATIVE OR DEFINED TARGET_LIKE_X86_LINUX_NATIVE OR DEFINED TARGET_LIKE_X86_OSX_NATIVE)
# describe the test executable
add_executable(mbed_trace_test EXCLUDE_FROM_ALL Test.cpp stubs/ip6tos_stub.c)
@ -13,10 +13,13 @@ if(DEFINED TARGET_LIKE_X86_WINDOWS_NATIVE OR DEFINED TARGET_LIKE_X86_LINUX_NATIV
if(DEFINED TARGET_LIKE_X86_WINDOWS_NATIVE)
add_test(mbed_trace_test "build/x86-windows-native/test/mbed_trace_test")
add_dependencies(all_tests mbed_trace_test)
endif()
if(DEFINED TARGET_LIKE_X86_LINUX_NATIVE)
elseif(DEFINED TARGET_LIKE_X86_LINUX_NATIVE)
SET(TEST_EXECUTABLE "../../../build/x86-linux-native/test/mbed_trace_test")
add_test(mbed_trace_test ${TEST_EXECUTABLE})
add_dependencies(all_tests mbed_trace_test)
elseif(DEFINED TARGET_LIKE_X86_OSX_NATIVE)
SET(TEST_EXECUTABLE "../../../build/x86-osx-native/test/mbed_trace_test")
add_test(mbed_trace_test ${TEST_EXECUTABLE})
add_dependencies(all_tests mbed_trace_test)
endif()
endif()

11
test/Test.cpp
View File

@ -454,6 +454,17 @@ TEST(trace, filters_control)
mbed_trace_exclude_filters_set(0);
STRCMP_EQUAL("", mbed_trace_exclude_filters_get());
}
TEST(trace, cmd_printer)
{
buf[0] = 0;
mbed_trace_config_set(TRACE_ACTIVE_LEVEL_ALL);
mbed_tracef(TRACE_LEVEL_CMD, "mygr", "default printer");
STRCMP_EQUAL("default printer", buf);
mbed_trace_cmdprint_function_set( myprint );
mbed_tracef(TRACE_LEVEL_CMD, "mygr", "custom printer");
STRCMP_EQUAL("\n", buf); // because there is two print calls, second one add line feeds
}
TEST(trace, no_printer)
{
mbed_tracef(TRACE_LEVEL_DEBUG, "mygr", "hello");