Skip to content

Commit b91995c

Browse files
bridadanbridadan
committed
Merge pull request #1 from bridadan/add-circle-ci
Add circle ci
2 parents 4ae6b05 + 1add211 commit b91995c

File tree

179 files changed

+10058
-7795
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+10058
-7795
lines changed

‎TESTS/integration/basic/main.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include "test_env.h"
2+
3+
int main() {
4+
GREENTEA_SETUP(15, "default_auto");
5+
GREENTEA_TESTSUITE_RESULT(true);
6+
}

‎circle.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
test:
2+
override:
3+
- cd ../testproject
4+
- python ../neo/neo.py compile -m K64F -t GCC_ARM -j 0 --source=mbed-os\TESTS\integration\basic
5+
6+
dependencies:
7+
pre:
8+
- cd ../
9+
- ls
10+
- git clone https://github.com/ARMmbed/neo.git
11+
- mkdir testproject
12+
- mv mbed-os testproject
13+
- cd testproject
14+
- git init
15+
- sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa
16+
- sudo apt-get update
17+
- sudo apt-get install gcc-arm-embedded

‎TARGET_Ignore/tests/rtos/mbed/basic/main.cpp renamed to ‎core/mbed-rtos/TESTS/mbed-rtos/basic/main.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ void led2_thread(void const *argument) {
3434
}
3535

3636
int main() {
37-
MBED_HOSTTEST_TIMEOUT(15);
38-
MBED_HOSTTEST_SELECT(wait_us_auto);
39-
MBED_HOSTTEST_DESCRIPTION(Basic thread);
40-
MBED_HOSTTEST_START("RTOS_1");
37+
GREENTEA_SETUP(15, "wait_us_auto");
4138

4239
Thread thread(led2_thread, NULL, osPriorityNormal, STACK_SIZE);
4340

‎TARGET_Ignore/tests/rtos/mbed/isr/main.cpp renamed to ‎core/mbed-rtos/TESTS/mbed-rtos/isr/main.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ void queue_thread(void const *argument) {
3838
}
3939

4040
int main (void) {
41-
MBED_HOSTTEST_TIMEOUT(20);
42-
MBED_HOSTTEST_SELECT(default_auto);
43-
MBED_HOSTTEST_DESCRIPTION(ISR (Queue));
44-
MBED_HOSTTEST_START("RTOS_8");
41+
GREENTEA_SETUP(20, "default_auto");
4542

4643
Thread thread(queue_thread, NULL, osPriorityNormal, STACK_SIZE);
4744
Ticker ticker;
@@ -66,6 +63,6 @@ int main (void) {
6663
}
6764
}
6865

69-
MBED_HOSTTEST_RESULT(result);
66+
GREENTEA_TESTSUITE_RESULT(result);
7067
return 0;
7168
}

‎TARGET_Ignore/tests/rtos/mbed/mail/main.cpp renamed to ‎core/mbed-rtos/TESTS/mbed-rtos/mail/main.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ void send_thread (void const *argument) {
4444
}
4545

4646
int main (void) {
47-
MBED_HOSTTEST_TIMEOUT(20);
48-
MBED_HOSTTEST_SELECT(default_auto);
49-
MBED_HOSTTEST_DESCRIPTION(Mail messaging);
50-
MBED_HOSTTEST_START("RTOS_6");
47+
GREENTEA_SETUP(20, "default_auto");
5148

5249
Thread thread(send_thread, NULL, osPriorityNormal, STACK_SIZE);
5350
bool result = true;
@@ -74,6 +71,6 @@ int main (void) {
7471
}
7572
}
7673
}
77-
MBED_HOSTTEST_RESULT(result);
74+
GREENTEA_TESTSUITE_RESULT(result);
7875
return 0;
7976
}

‎TARGET_Ignore/tests/rtos/mbed/mutex/main.cpp renamed to ‎core/mbed-rtos/TESTS/mbed-rtos/mutex/main.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,7 @@ void test_thread(void const *args) {
7373
}
7474

7575
int main() {
76-
MBED_HOSTTEST_TIMEOUT(20);
77-
MBED_HOSTTEST_SELECT(default);
78-
MBED_HOSTTEST_DESCRIPTION(Mutex resource lock);
79-
MBED_HOSTTEST_START("RTOS_2");
80-
76+
GREENTEA_SETUP(20, "default_auto");
8177
const int t1_delay = THREAD_DELAY * 1;
8278
const int t2_delay = THREAD_DELAY * 2;
8379
const int t3_delay = THREAD_DELAY * 3;
@@ -96,6 +92,6 @@ int main() {
9692
}
9793

9894
fflush(stdout);
99-
MBED_HOSTTEST_RESULT(!mutex_defect);
95+
GREENTEA_TESTSUITE_RESULT(!mutex_defect);
10096
return 0;
10197
}

‎TARGET_Ignore/tests/rtos/mbed/queue/main.cpp renamed to ‎core/mbed-rtos/TESTS/mbed-rtos/queue/main.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@ void send_thread (void const *argument) {
4646
}
4747

4848
int main (void) {
49-
MBED_HOSTTEST_TIMEOUT(20);
50-
MBED_HOSTTEST_SELECT(default_auto);
51-
MBED_HOSTTEST_DESCRIPTION(Queue messaging);
52-
MBED_HOSTTEST_START("RTOS_5");
49+
GREENTEA_SETUP(20, "default_auto");
5350

5451
Thread thread(send_thread, NULL, osPriorityNormal, STACK_SIZE);
5552
bool result = true;
@@ -76,6 +73,6 @@ int main (void) {
7673
}
7774
}
7875
}
79-
MBED_HOSTTEST_RESULT(result);
76+
GREENTEA_TESTSUITE_RESULT(result);
8077
return 0;
8178
}

‎TARGET_Ignore/tests/rtos/mbed/semaphore/main.cpp renamed to ‎core/mbed-rtos/TESTS/mbed-rtos/semaphore/main.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,7 @@ void test_thread(void const *delay) {
6464
}
6565

6666
int main (void) {
67-
MBED_HOSTTEST_TIMEOUT(20);
68-
MBED_HOSTTEST_SELECT(default_auto);
69-
MBED_HOSTTEST_DESCRIPTION(Semaphore resource lock);
70-
MBED_HOSTTEST_START("RTOS_3");
67+
GREENTEA_SETUP(20, "default_auto");
7168

7269
const int t1_delay = THREAD_DELAY * 1;
7370
const int t2_delay = THREAD_DELAY * 2;
@@ -86,6 +83,6 @@ int main (void) {
8683
}
8784

8885
fflush(stdout);
89-
MBED_HOSTTEST_RESULT(!sem_defect);
86+
GREENTEA_TESTSUITE_RESULT(!sem_defect);
9087
return 0;
9188
}

‎TARGET_Ignore/tests/rtos/mbed/signals/main.cpp renamed to ‎core/mbed-rtos/TESTS/mbed-rtos/signals/main.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ void led_thread(void const *argument) {
3232
}
3333

3434
int main (void) {
35-
MBED_HOSTTEST_TIMEOUT(20);
36-
MBED_HOSTTEST_SELECT(default_auto);
37-
MBED_HOSTTEST_DESCRIPTION(Signals messaging);
38-
MBED_HOSTTEST_START("RTOS_4");
35+
GREENTEA_SETUP(20, "default_auto");
3936

4037
Thread thread(led_thread, NULL, osPriorityNormal, STACK_SIZE);
4138
bool result = true;
@@ -48,6 +45,6 @@ int main (void) {
4845
break;
4946
}
5047
}
51-
MBED_HOSTTEST_RESULT(result);
48+
GREENTEA_TESTSUITE_RESULT(result);
5249
return 0;
5350
}

‎TARGET_Ignore/tests/rtos/mbed/timer/main.cpp renamed to ‎core/mbed-rtos/TESTS/mbed-rtos/timer/main.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ void blink(void const *n) {
2323
}
2424

2525
int main(void) {
26-
MBED_HOSTTEST_TIMEOUT(15);
27-
MBED_HOSTTEST_SELECT(wait_us_auto);
28-
MBED_HOSTTEST_DESCRIPTION(Timer);
29-
MBED_HOSTTEST_START("RTOS_7");
26+
GREENTEA_SETUP(15, "wait_us_auto");
3027

3128
RtosTimer led_1_timer(blink, osTimerPeriodic, (void *)0);
3229
RtosTimer led_2_timer(blink, osTimerPeriodic, (void *)1);

‎core/mbed-rtos/rtos/Mutex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Mutex {
5757
osMutexId _osMutexId;
5858
osMutexDef_t _osMutexDef;
5959
#ifdef CMSIS_OS_RTX
60-
#if defined(__MBED_CMSIS_RTOS_CA9) || defined(__MBED_CMSIS_RTOS_CM)
60+
#ifdef __MBED_CMSIS_RTOS_CA9
6161
int32_t _mutex_data[4];
6262
#else
6363
int32_t _mutex_data[3];

‎core/mbed-rtos/rtos/RtosTimer.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,8 @@ class RtosTimer {
6161
private:
6262
osTimerId _timer_id;
6363
osTimerDef_t _timer;
64-
#if defined(CMSIS_OS_RTX) && !defined(__MBED_CMSIS_RTOS_CM)
64+
#ifdef CMSIS_OS_RTX
6565
uint32_t _timer_data[5];
66-
#else
67-
uint32_t _timer_data[6];
6866
#endif
6967
};
7068

‎core/mbed-rtos/rtos/Thread.cpp

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace rtos {
2828

2929
Thread::Thread(void (*task)(void const *argument), void *argument,
3030
osPriority priority, uint32_t stack_size, unsigned char *stack_pointer) {
31-
#ifdef __MBED_CMSIS_RTOS_CM
31+
#ifdef CMSIS_OS_RTX
3232
_thread_def.pthread = task;
3333
_thread_def.tpriority = priority;
3434
_thread_def.stacksize = stack_size;
@@ -71,10 +71,8 @@ int32_t Thread::signal_clr(int32_t signals) {
7171
}
7272

7373
Thread::State Thread::get_state() {
74-
#if !defined(__MBED_CMSIS_RTOS_CA9) && !defined(__MBED_CMSIS_RTOS_CM)
75-
#ifdef CMSIS_OS_RTX
74+
#ifndef __MBED_CMSIS_RTOS_CA9
7675
return ((State)_thread_def.tcb.state);
77-
#endif
7876
#else
7977
uint8_t status;
8078
status = osThreadGetState(_tid);
@@ -84,55 +82,39 @@ Thread::State Thread::get_state() {
8482

8583
uint32_t Thread::stack_size() {
8684
#ifndef __MBED_CMSIS_RTOS_CA9
87-
#if defined(CMSIS_OS_RTX) && !defined(__MBED_CMSIS_RTOS_CM)
8885
return _thread_def.tcb.priv_stack;
8986
#else
9087
return 0;
9188
#endif
92-
#else
93-
return 0;
94-
#endif
9589
}
9690

9791
uint32_t Thread::free_stack() {
9892
#ifndef __MBED_CMSIS_RTOS_CA9
99-
#if defined(CMSIS_OS_RTX) && !defined(__MBED_CMSIS_RTOS_CM)
10093
uint32_t bottom = (uint32_t)_thread_def.tcb.stack;
10194
return _thread_def.tcb.tsk_stack - bottom;
10295
#else
10396
return 0;
10497
#endif
105-
#else
106-
return 0;
107-
#endif
10898
}
10999

110100
uint32_t Thread::used_stack() {
111101
#ifndef __MBED_CMSIS_RTOS_CA9
112-
#if defined(CMSIS_OS_RTX) && !defined(__MBED_CMSIS_RTOS_CM)
113102
uint32_t top = (uint32_t)_thread_def.tcb.stack + _thread_def.tcb.priv_stack;
114103
return top - _thread_def.tcb.tsk_stack;
115104
#else
116105
return 0;
117106
#endif
118-
#else
119-
return 0;
120-
#endif
121107
}
122108

123109
uint32_t Thread::max_stack() {
124110
#ifndef __MBED_CMSIS_RTOS_CA9
125-
#if defined(CMSIS_OS_RTX) && !defined(__MBED_CMSIS_RTOS_CM)
126111
uint32_t high_mark = 0;
127112
while (_thread_def.tcb.stack[high_mark] == 0xE25A2EA5)
128113
high_mark++;
129114
return _thread_def.tcb.priv_stack - (high_mark * 4);
130115
#else
131116
return 0;
132117
#endif
133-
#else
134-
return 0;
135-
#endif
136118
}
137119

138120
osEvent Thread::signal_wait(int32_t signals, uint32_t millisec) {
@@ -157,11 +139,9 @@ void Thread::attach_idle_hook(void (*fptr)(void)) {
157139

158140
Thread::~Thread() {
159141
terminate();
160-
#ifdef __MBED_CMSIS_RTOS_CM
161142
if (_dynamic_stack) {
162143
delete[] (_thread_def.stack_pointer);
163144
}
164-
#endif
165145
}
166146

167147
}

0 commit comments

Comments
 (0)