Skip to content

Commit 8fda5a4

Browse files
committed
Use dedicated macros to skip test cases instead target macro.
1 parent 22acc79 commit 8fda5a4

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ Case cases[] = {
338338
Case("38400, 8N1, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, fpga_uart_test_common_no_fc<38400, 8, ParityNone, 1, false> >),
339339
Case("115200, 8N1, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, fpga_uart_test_common_no_fc<115200, 8, ParityNone, 1, false> >),
340340
// stop bits
341-
#if !defined(TARGET_NRF52840)
341+
#if !defined(UART_TWO_STOP_BITS_NOT_SUPPORTED)
342342
Case("9600, 8N2, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, fpga_uart_test_common_no_fc<9600, 8, ParityNone, 2, false> >),
343343
#endif
344344

@@ -357,12 +357,12 @@ Case cases[] = {
357357
Case("115200, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, fpga_uart_test_common<115200, 8, ParityNone, 1, false> >),
358358
// data bits: not tested (some platforms support 8 bits only)
359359
// parity
360-
#if !defined(TARGET_NRF52840)
360+
#if !defined(UART_ODD_PARITY_NOT_SUPPORTED)
361361
Case("9600, 8O1, FC on", one_peripheral<UARTPort, DefaultFormFactor, fpga_uart_test_common<9600, 8, ParityOdd, 1, false> >),
362362
#endif
363363
Case("9600, 8E1, FC on", one_peripheral<UARTPort, DefaultFormFactor, fpga_uart_test_common<9600, 8, ParityEven, 1, false> >),
364364
// stop bits
365-
#if !defined(TARGET_NRF52840)
365+
#if !defined(UART_TWO_STOP_BITS_NOT_SUPPORTED)
366366
Case("9600, 8N2, FC on", one_peripheral<UARTPort, DefaultFormFactor, fpga_uart_test_common<9600, 8, ParityNone, 2, false> >),
367367
#endif
368368
#endif

targets/targets.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2441,7 +2441,7 @@
24412441
"TRNG",
24422442
"FLASH",
24432443
"WATCHDOG"
2444-
],
2444+
],
24452445
"release_versions": [
24462446
"2",
24472447
"5"
@@ -2464,7 +2464,7 @@
24642464
"FSL_RTOS_MBED",
24652465
"USE_EXTERNAL_RTC"
24662466
],
2467-
"default_toolchain": "ARM",
2467+
"default_toolchain": "ARM",
24682468
"forced_reset_timeout": 7,
24692469
"release_versions": [
24702470
"2",
@@ -11097,7 +11097,9 @@
1109711097
"WSF_MAX_HANDLERS=10",
1109811098
"MBED_MPU_CUSTOM",
1109911099
"SWI_DISABLE0",
11100-
"NRF52_PAN_20"
11100+
"NRF52_PAN_20",
11101+
"UART_TWO_STOP_BITS_NOT_SUPPORTED",
11102+
"UART_ODD_PARITY_NOT_SUPPORTED"
1110111103
],
1110211104
"features": [
1110311105
"CRYPTOCELL310",
@@ -14128,7 +14130,7 @@
1412814130
"smclk_select": "HFXT",
1412914131
"smclk_div": "DIV2",
1413014132
"adc_auto_scan": 1
14131-
},
14133+
},
1413214134
"release_versions": [
1413314135
"2",
1413414136
"5"

0 commit comments

Comments
 (0)