Skip to content

Commit 808c450

Browse files
0xc01700xc0170
authored
Merge pull request #11195 from ARMmbed/release-candidate
Release candidate for mbed-os-5.13.3
2 parents b81aeff + d587e73 commit 808c450

File tree

303 files changed

+16394
-1465
lines changed

Some content is hidden

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

303 files changed

+16394
-1465
lines changed

‎TESTS/events/queue/main.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#if !DEVICE_USTICKER
2424
#error [NOT_SUPPORTED] test not supported
25-
#endif
25+
#else
2626

2727
using namespace utest::v1;
2828

@@ -357,3 +357,4 @@ int main()
357357
return !Harness::run(specification);
358358
}
359359

360+
#endif // !DEVICE_USTICKER

‎TESTS/events/timing/main.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ using namespace utest::v1;
2626

2727
#if !DEVICE_USTICKER
2828
#error [NOT_SUPPORTED] test not supported
29-
#endif
29+
#else
3030

3131
// Test delay
3232
#ifndef TEST_EVENTS_TIMING_TIME
@@ -148,3 +148,4 @@ int main()
148148
return !Harness::run(specification);
149149
}
150150

151+
#endif // !DEVICE_USTICKER

‎TESTS/lorawan/loraradio/main.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#error [NOT_SUPPORTED] Requires parameters from application config file.
3737
#endif
3838

39+
#if (MBED_CONF_APP_LORA_RADIO == SX1272) || (MBED_CONF_APP_LORA_RADIO == SX1276)
3940

4041
using namespace utest::v1;
4142
using namespace mbed;
@@ -281,3 +282,5 @@ int main()
281282
{
282283
return !Harness::run(specification);
283284
}
285+
286+
#endif // (MBED_CONF_APP_LORA_RADIO == SX1272) || (MBED_CONF_APP_LORA_RADIO == SX1276)

‎TESTS/mbed-crypto/sanity/main.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
2121
#error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.
22-
#endif
22+
#else
2323

2424
#include <stdio.h>
2525
#include "mbed.h"
@@ -460,3 +460,4 @@ int main(void)
460460
{
461461
return !Harness::run(specification);
462462
}
463+
#endif // ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))

‎TESTS/mbed_drivers/flashiap/main.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#if !DEVICE_FLASH
1919
#error [NOT_SUPPORTED] Flash API not supported for this target
20-
#endif
20+
#else
2121

2222
#include "utest/utest.h"
2323
#include "utest/utest_serial.h"
@@ -328,3 +328,5 @@ int main()
328328
{
329329
Harness::run(specification);
330330
}
331+
332+
#endif // !DEVICE_FLASH

‎TESTS/mbed_drivers/lp_ticker/main.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#if !DEVICE_LPTICKER
2323
#error [NOT_SUPPORTED] Low power ticker not supported for this target
24-
#endif
24+
#else
2525

2626
using utest::v1::Case;
2727

@@ -228,3 +228,5 @@ int main()
228228
{
229229
utest::v1::Harness::run(specification);
230230
}
231+
232+
#endif // !DEVICE_LPTICKER

‎TESTS/mbed_drivers/lp_timeout/main.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#if !DEVICE_LPTICKER
1818
#error [NOT_SUPPORTED] Low power timer not supported for this target
19-
#endif
19+
#else
2020

2121
#include "mbed.h"
2222
#include "greentea-client/test_env.h"
@@ -93,3 +93,5 @@ int main()
9393
{
9494
Harness::run(specification);
9595
}
96+
97+
#endif // !DEVICE_LPTICKER

‎TESTS/mbed_drivers/lp_timer/main.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#if !DEVICE_LPTICKER
2626
#error [NOT_SUPPORTED] test not supported
27-
#endif
27+
#else
2828

2929
using namespace utest::v1;
3030

@@ -350,3 +350,5 @@ int main()
350350
{
351351
return !Harness::run(specification);
352352
}
353+
354+
#endif // !DEVICE_LPTICKER

‎TESTS/mbed_drivers/mem_trace/main.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#ifndef MBED_MEM_TRACING_ENABLED
2828
#error [NOT_SUPPORTED] test not supported
29-
#endif
29+
#else
3030

3131
using utest::v1::Case;
3232

@@ -427,3 +427,5 @@ int main()
427427

428428
return !utest::v1::Harness::run(specification);
429429
}
430+
431+
#endif // MBED_MEM_TRACING_ENABLED

‎TESTS/mbed_drivers/race_test/main.cpp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,9 @@
2222
#include "SingletonPtr.h"
2323
#include <stdio.h>
2424

25-
#ifdef MBED_RTOS_SINGLE_THREAD
26-
#error [NOT_SUPPORTED] test not supported for single threaded enviroment
27-
#endif
28-
29-
#if !DEVICE_USTICKER
30-
#error [NOT_SUPPORTED] test not supported
31-
#endif
25+
#if defined(MBED_RTOS_SINGLE_THREAD) || !DEVICE_USTICKER
26+
#error [NOT_SUPPORTED] Test not supported for single threaded enviroment. UsTicker need to be enabled for this test.
27+
#else
3228

3329
using namespace utest::v1;
3430

@@ -135,3 +131,5 @@ int main()
135131
{
136132
Harness::run(specification);
137133
}
134+
135+
#endif // defined(MBED_RTOS_SINGLE_THREAD) || !DEVICE_USTICKER

0 commit comments

Comments
 (0)