Skip to content

Commit a344676

Browse files
author
Arto Kinnunen
authored
Remove references to yotta (#118)
1 parent 610afda commit a344676

File tree

5 files changed

+7
-21
lines changed

5 files changed

+7
-21
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,5 @@
33
output
44
lcov
55
coverage
6-
.yotta.json
76
build/
8-
yotta_modules/
9-
yotta_targets/
107
upload.tar.gz

Makefile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ test: $(TESTDIRS)
4040
@rm -f lcov/index.xml
4141
@find ./ -name '*.gcno' | xargs cp --backup=numbered -t ./coverage/
4242
@find ./ -name '*.gcda' | xargs cp --backup=numbered -t ./coverage/
43-
@gcovr --object-directory ./coverage --exclude-unreachable-branches -e '.*/builds/.*' -e '.*/test/.*' -e '.*/yotta_modules/.*' -e '.*/stub/.*' -x -o ./lcov/gcovr.xml
43+
@gcovr --object-directory ./coverage --exclude-unreachable-branches -e '.*/builds/.*' -e '.*/test/.*' -e '.*/stub/.*' -x -o ./lcov/gcovr.xml
4444
@lcov -d test/. -c -o $(COVERAGEFILE)
4545
@lcov -q -r $(COVERAGEFILE) "/usr*" -o $(COVERAGEFILE)
4646
@lcov -q -r $(COVERAGEFILE) "/test*" -o $(COVERAGEFILE)

test/coap-service/unittest/makefile_defines.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,6 @@ INCLUDE_DIRS =\
2424
../stub\
2525
../../../../coap-service/\
2626
../../../../source/include/\
27-
../../../../yotta_modules/mbedtls/ \
28-
../../../../yotta_modules/sal-stack-nanostack/nanostack/ \
29-
../../../../yotta_modules/nanostack-randlib/mbed-client-randlib/ \
30-
../../../../yotta_modules/nanostack-libservice/ \
31-
../../../../yotta_modules/nanostack-libservice/mbed-client-libservice/ \
32-
../../../../yotta_modules/mbed-coap/ \
33-
../../../../yotta_modules/mbed-coap/source/include/ \
34-
../../../../yotta_modules/sal-stack-nanostack-eventloop/nanostack-event-loop/ \
35-
../../../../yotta_modules/sal-stack-nanostack-eventloop/source/ \
36-
../../../../yotta_modules/mbed-trace/ \
3727
../../../../../nanostack/nanostack/\
3828
../../../../../libService/libService/\
3929
../../../../../mbed-coap/\

test/coap-service/unittest/run_tests

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ lcov -q -d ../. -c -o app.info
3838
lcov -q -r app.info "/test*" -o app.info
3939
lcov -q -r app.info "/usr*" -o app.info
4040
lcov -q -r app.info "/libService*" -o app.info
41-
lcov -q -r app.info "/yotta_modules*" -o app.info
4241
genhtml -q --no-branch-coverage app.info
4342
cd ..
4443
echo

test/coap-service/unittest/stub/mbed_trace_stub.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
#include <stdarg.h>
2020
#include <stdlib.h>
2121

22-
#ifndef YOTTA_CFG_MBED_TRACE
23-
#define YOTTA_CFG_MBED_TRACE 1
24-
#define YOTTA_CFG_MBED_TRACE_FEA_IPV6 1
22+
#ifndef MBED_CONF_MBED_TRACE_ENABLE
23+
#define MBED_CONF_MBED_TRACE_ENABLE 1
24+
#define MBED_CONF_MBED_TRACE_FEA_IPV6 1
2525
#endif
2626

2727
#include "mbed-trace/mbed_trace.h"
28-
#if YOTTA_CFG_MBED_TRACE_FEA_IPV6 == 1
28+
#if MBED_CONF_MBED_TRACE_FEA_IPV6 == 1
2929
#include "mbed-client-libservice/ip6string.h"
3030
#include "mbed-client-libservice/common_functions.h"
3131
#endif
@@ -99,7 +99,7 @@ const char *mbed_trace_last(void)
9999

100100
/* Helping functions */
101101
#define tmp_data_left() m_trace.tmp_data_length-(m_trace.tmp_data_ptr-m_trace.tmp_data)
102-
#if YOTTA_CFG_MBED_TRACE_FEA_IPV6 == 1
102+
#if MBED_CONF_MBED_TRACE_FEA_IPV6 == 1
103103
char *mbed_trace_ipv6(const void *addr_ptr)
104104
{
105105
return NULL;
@@ -109,7 +109,7 @@ char *mbed_trace_ipv6_prefix(const uint8_t *prefix, uint8_t prefix_len)
109109
{
110110
return NULL;
111111
}
112-
#endif //YOTTA_CFG_MBED_TRACE_FEA_IPV6
112+
#endif //MBED_CONF_MBED_TRACE_FEA_IPV6
113113

114114
char *mbed_trace_array(const uint8_t *buf, uint16_t len)
115115
{

0 commit comments

Comments
 (0)