Skip to content

Commit 5f13881

Browse files
authored
Merge pull request #4294 from ARMmbed/feature_cmsis5
Update CMSIS-Core and RTX to version 5
2 parents 2886f0b + c674ee2 commit 5f13881

File tree

404 files changed

+45654
-31594
lines changed

Some content is hidden

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

404 files changed

+45654
-31594
lines changed

Jenkinsfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ def parallelSteps = mbed.createParalleSteps("mbed-os", targets, toolchains)
2424
mbed.compile(parallelSteps)
2525

2626
def testApps = [
27-
"mbed-os-cliapp",
28-
"mbed-client-testapp"
27+
"mbed-os-cliapp"
2928
]
3029

3130
// buildTestApps accepts array of test application names and a mbed-os branch or PR reference as parameters

TESTS/mbedmicro-rtos-mbed/mutex/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ void test_dual_thread_lock_lock_thread(Mutex *mutex)
142142
uint32_t start = us_ticker_read();
143143

144144
osStatus stat = mutex->lock(TEST_HALF_SEC_MS);
145-
TEST_ASSERT_EQUAL(stat, osEventTimeout);
145+
TEST_ASSERT_EQUAL(stat, osErrorTimeout);
146146
TEST_ASSERT_UINT32_WITHIN(TEST_ONE_MS_US, TEST_HALF_SEC_US, us_ticker_read() - start);
147147
}
148148

TESTS/mbedmicro-rtos-mbed/threads/main.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@ void self_terminate(Thread *self) {
6161
// Tests that spawn tasks in different configurations
6262
template <void (*F)(counter_t *)>
6363
void test_single_thread() {
64+
const char tname[] = "Single Thread";
6465
counter_t counter(0);
65-
Thread thread(osPriorityNormal, THREAD_STACK_SIZE, NULL);
66+
Thread thread(osPriorityNormal, THREAD_STACK_SIZE, NULL, tname);
6667
thread.start(callback(F, &counter));
6768
thread.join();
6869
TEST_ASSERT_EQUAL(counter, 1);
70+
TEST_ASSERT_EQUAL(strcmp(tname, thread.get_name()), 0);
6971
}
7072

7173
template <int N, void (*F)(counter_t *)>

0 commit comments

Comments
 (0)