Skip to content

Commit 6656fbf

Browse files
committed
Merge pull request #31 from 0xc0170/rtos_tests
Rtos tests
2 parents 55e6838 + 477d957 commit 6656fbf

File tree

8 files changed

+14
-39
lines changed

8 files changed

+14
-39
lines changed

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);

0 commit comments

Comments
 (0)