Skip to content

Commit 7385a88

Browse files
theotherjimmytheotherjimmy
authored
Merge pull request #4313 from c1728p9/tool_changes
Remove and cleanup old code in the tools
2 parents 5ebe295 + 4b9b718 commit 7385a88

File tree

7 files changed

+83
-342
lines changed

7 files changed

+83
-342
lines changed

‎tools/build.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@
6868
default=False,
6969
help="Compile the rpc library")
7070

71-
parser.add_argument("-U", "--usb_host",
72-
action="store_true",
73-
dest="usb_host",
74-
default=False,
75-
help="Compile the USB Host library")
76-
7771
parser.add_argument("-u", "--usb",
7872
action="store_true",
7973
dest="usb",
@@ -163,14 +157,10 @@
163157
libraries = []
164158

165159
# Additional Libraries
166-
if options.rtos:
167-
libraries.extend(["rtx", "rtos"])
168160
if options.rpc:
169161
libraries.extend(["rpc"])
170162
if options.usb:
171163
libraries.append("usb")
172-
if options.usb_host:
173-
libraries.append("usb_host")
174164
if options.dsp:
175165
libraries.extend(["dsp"])
176166
if options.cpputest_lib:

‎tools/build_api.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,13 +1040,14 @@ def build_mbed_libs(target, toolchain_name, verbose=False,
10401040

10411041
# A number of compiled files need to be copied as objects as opposed to
10421042
# way the linker search for symbols in archives. These are:
1043-
# - retarget.o: to make sure that the C standard lib symbols get
1043+
# - mbed_retarget.o: to make sure that the C standard lib symbols get
10441044
# overridden
1045-
# - board.o: mbed_die is weak
1045+
# - mbed_board.o: mbed_die is weak
10461046
# - mbed_overrides.o: this contains platform overrides of various
10471047
# weak SDK functions
1048-
separate_names, separate_objects = ['retarget.o', 'board.o',
1049-
'mbed_overrides.o'], []
1048+
# - mbed_main.o: this contains main redirection
1049+
separate_names, separate_objects = ['mbed_retarget.o', 'mbed_board.o',
1050+
'mbed_overrides.o', 'mbed_main.o'], []
10501051

10511052
for obj in objects:
10521053
for name in separate_names:

‎tools/build_travis.py

Lines changed: 71 additions & 91 deletions
Large diffs are not rendered by default.

‎tools/libraries.py

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
"""
17-
from tools.paths import MBED_RTX, RTOS, RTOS_LIBRARIES, MBED_LIBRARIES,\
18-
MBED_RPC, RPC_LIBRARY, USB, USB_LIBRARIES, USB_HOST,\
19-
USB_HOST_LIBRARIES, DSP_ABSTRACTION, DSP_CMSIS, DSP_LIBRARIES,\
17+
from tools.paths import MBED_LIBRARIES,\
18+
MBED_RPC, RPC_LIBRARY, USB, USB_LIBRARIES, \
19+
DSP_ABSTRACTION, DSP_CMSIS, DSP_LIBRARIES,\
2020
CPPUTEST_SRC,\
2121
CPPUTEST_PLATFORM_SRC, CPPUTEST_TESTRUNNER_SCR, CPPUTEST_LIBRARY,\
2222
CPPUTEST_INC, CPPUTEST_PLATFORM_INC, CPPUTEST_TESTRUNNER_INC,\
@@ -26,20 +26,6 @@
2626

2727

2828
LIBRARIES = [
29-
# RTOS libraries
30-
{
31-
"id": "rtx",
32-
"source_dir": MBED_RTX,
33-
"build_dir": RTOS_LIBRARIES,
34-
"dependencies": [MBED_LIBRARIES],
35-
},
36-
{
37-
"id": "rtos",
38-
"source_dir": RTOS,
39-
"build_dir": RTOS_LIBRARIES,
40-
"dependencies": [MBED_LIBRARIES, MBED_RTX],
41-
},
42-
4329
# RPC
4430
{
4531
"id": "rpc",
@@ -56,14 +42,6 @@
5642
"dependencies": [MBED_LIBRARIES],
5743
},
5844

59-
# USB Host libraries
60-
{
61-
"id": "usb_host",
62-
"source_dir": USB_HOST,
63-
"build_dir": USB_HOST_LIBRARIES,
64-
"dependencies": [MBED_LIBRARIES, MBED_RTX, RTOS_LIBRARIES],
65-
},
66-
6745
# DSP libraries
6846
{
6947
"id": "dsp",

‎tools/make.py

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@
3333
from tools.utils import NotSupportedException
3434
from tools.paths import BUILD_DIR
3535
from tools.paths import MBED_LIBRARIES
36-
from tools.paths import RTOS_LIBRARIES
3736
from tools.paths import RPC_LIBRARY
38-
from tools.paths import USB_HOST_LIBRARIES, USB_LIBRARIES
37+
from tools.paths import USB_LIBRARIES
3938
from tools.paths import DSP_LIBRARIES
4039
from tools.tests import TESTS, Test, TEST_MAP
4140
from tools.tests import TEST_MBED_LIB
@@ -133,21 +132,11 @@
133132
default=False, help="List available tests in order and exit")
134133

135134
# Ideally, all the tests with a single "main" thread can be run with, or
136-
# without the rtos, usb_host, usb, dsp
137-
parser.add_argument("--rtos",
138-
action="store_true", dest="rtos",
139-
default=False, help="Link with RTOS library")
140-
135+
# without the usb, dsp
141136
parser.add_argument("--rpc",
142137
action="store_true", dest="rpc",
143138
default=False, help="Link with RPC library")
144139

145-
parser.add_argument("--usb_host",
146-
action="store_true",
147-
dest="usb_host",
148-
default=False,
149-
help="Link with USB Host library")
150-
151140
parser.add_argument("--usb",
152141
action="store_true",
153142
dest="usb",
@@ -258,9 +247,7 @@
258247
sys.exit()
259248

260249
# Linking with extra libraries
261-
if options.rtos: test.dependencies.append(RTOS_LIBRARIES)
262250
if options.rpc: test.dependencies.append(RPC_LIBRARY)
263-
if options.usb_host: test.dependencies.append(USB_HOST_LIBRARIES)
264251
if options.usb: test.dependencies.append(USB_LIBRARIES)
265252
if options.dsp: test.dependencies.append(DSP_LIBRARIES)
266253
if options.testlib: test.dependencies.append(TEST_MBED_LIB)

‎tools/paths.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@
5555

5656
RPC_LIBRARY = join(BUILD_DIR, "rpc")
5757

58-
# mbed RTOS
59-
RTOS = join(ROOT, "rtos")
60-
MBED_RTX = join(RTOS, "rtx")
61-
62-
RTOS_LIBRARIES = join(BUILD_DIR, "rtos")
63-
6458
# DSP
6559
DSP = join(LIB_DIR, "dsp")
6660
DSP_CMSIS = join(DSP, "cmsis_dsp")
@@ -71,10 +65,6 @@
7165
USB = join(LIB_DIR, "USBDevice")
7266
USB_LIBRARIES = join(BUILD_DIR, "usb")
7367

74-
# USB Host
75-
USB_HOST = join(LIB_DIR, "USBHost")
76-
USB_HOST_LIBRARIES = join(BUILD_DIR, "usb_host")
77-
7868
# Export
7969
EXPORT_DIR = join(BUILD_DIR, "export")
8070
EXPORT_WORKSPACE = join(EXPORT_DIR, "workspace")

‎tools/tests.py

Lines changed: 2 additions & 187 deletions
Original file line numberDiff line numberDiff line change
@@ -640,181 +640,6 @@
640640
"automated": False
641641
},
642642

643-
# CMSIS RTOS tests
644-
{
645-
"id": "CMSIS_RTOS_1", "description": "Basic",
646-
"source_dir": join(TEST_DIR, "rtos", "cmsis", "basic"),
647-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES],
648-
},
649-
{
650-
"id": "CMSIS_RTOS_2", "description": "Mutex",
651-
"source_dir": join(TEST_DIR, "rtos", "cmsis", "mutex"),
652-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES],
653-
},
654-
{
655-
"id": "CMSIS_RTOS_3", "description": "Semaphore",
656-
"source_dir": join(TEST_DIR, "rtos", "cmsis", "semaphore"),
657-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES],
658-
},
659-
{
660-
"id": "CMSIS_RTOS_4", "description": "Signals",
661-
"source_dir": join(TEST_DIR, "rtos", "cmsis", "signals"),
662-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES],
663-
},
664-
{
665-
"id": "CMSIS_RTOS_5", "description": "Queue",
666-
"source_dir": join(TEST_DIR, "rtos", "cmsis", "queue"),
667-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES],
668-
},
669-
{
670-
"id": "CMSIS_RTOS_6", "description": "Mail",
671-
"source_dir": join(TEST_DIR, "rtos", "cmsis", "mail"),
672-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES],
673-
},
674-
{
675-
"id": "CMSIS_RTOS_7", "description": "Timer",
676-
"source_dir": join(TEST_DIR, "rtos", "cmsis", "timer"),
677-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES],
678-
},
679-
{
680-
"id": "CMSIS_RTOS_8", "description": "ISR",
681-
"source_dir": join(TEST_DIR, "rtos", "cmsis", "isr"),
682-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES],
683-
},
684-
685-
# mbed RTOS tests
686-
{
687-
"id": "RTOS_1", "description": "Basic thread",
688-
"source_dir": join(TEST_DIR, "rtos", "mbed", "basic"),
689-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB],
690-
"automated": True,
691-
#"host_test": "wait_us_auto",
692-
"mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824",
693-
"KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR",
694-
"RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI",
695-
"NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F070RB", "NUCLEO_F207ZG",
696-
"DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG",
697-
"DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303ZE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE", "NUCLEO_F446RE", "NUCLEO_F446ZE", "NUCLEO_F103RB", "DISCO_F746NG", "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE",
698-
"EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800",
699-
"NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453",
700-
"NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"],
701-
},
702-
{
703-
"id": "RTOS_2", "description": "Mutex resource lock",
704-
"source_dir": join(TEST_DIR, "rtos", "mbed", "mutex"),
705-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB],
706-
"automated": True,
707-
"mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824",
708-
"KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR",
709-
"RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI",
710-
"NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG",
711-
"DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG",
712-
"DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE", "NUCLEO_F446RE", "NUCLEO_F103RB", "DISCO_F746NG",
713-
"NUCLEO_F446ZE", "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE",
714-
"EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800",
715-
"NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453",
716-
"NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"],
717-
},
718-
{
719-
"id": "RTOS_3", "description": "Semaphore resource lock",
720-
"source_dir": join(TEST_DIR, "rtos", "mbed", "semaphore"),
721-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB],
722-
"automated": True,
723-
"mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824",
724-
"KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR",
725-
"RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI",
726-
"NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG",
727-
"DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG",
728-
"DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE", "NUCLEO_F446RE", "NUCLEO_F446ZE",
729-
"NUCLEO_F103RB", "DISCO_F746NG",
730-
"NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE",
731-
"EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800",
732-
"NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453",
733-
"NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"],
734-
},
735-
{
736-
"id": "RTOS_4", "description": "Signals messaging",
737-
"source_dir": join(TEST_DIR, "rtos", "mbed", "signals"),
738-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB],
739-
"automated": True,
740-
"mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824",
741-
"KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR",
742-
"RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI",
743-
"NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG",
744-
"DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG",
745-
"DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE", "NUCLEO_F446RE", "NUCLEO_F446ZE",
746-
"NUCLEO_F103RB", "DISCO_F746NG",
747-
"NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE",
748-
"EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800",
749-
"NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453",
750-
"NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"],
751-
},
752-
{
753-
"id": "RTOS_5", "description": "Queue messaging",
754-
"source_dir": join(TEST_DIR, "rtos", "mbed", "queue"),
755-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB],
756-
"automated": True,
757-
"mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824",
758-
"KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR",
759-
"RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI",
760-
"NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG",
761-
"DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG",
762-
"DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE",
763-
"NUCLEO_F446RE", "NUCLEO_F446ZE", "NUCLEO_F103RB", "DISCO_F746NG", "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE",
764-
"EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800",
765-
"NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453",
766-
"NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"],
767-
},
768-
{
769-
"id": "RTOS_6", "description": "Mail messaging",
770-
"source_dir": join(TEST_DIR, "rtos", "mbed", "mail"),
771-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB],
772-
"automated": True,
773-
"mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824",
774-
"KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR",
775-
"RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI",
776-
"NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG",
777-
"DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG",
778-
"DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE",
779-
"NUCLEO_F446RE", "NUCLEO_F446ZE", "NUCLEO_F103RB", "DISCO_F746NG", "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE",
780-
"EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800",
781-
"NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453",
782-
"NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"],
783-
},
784-
{
785-
"id": "RTOS_7", "description": "Timer",
786-
"source_dir": join(TEST_DIR, "rtos", "mbed", "timer"),
787-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB],
788-
"automated": True,
789-
#"host_test": "wait_us_auto",
790-
"mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824",
791-
"KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR",
792-
"RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI",
793-
"NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG",
794-
"DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG",
795-
"DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE",
796-
"NUCLEO_F446RE", "NUCLEO_F446ZE", "NUCLEO_F103RB", "DISCO_F746NG", "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE",
797-
"EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800",
798-
"NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453",
799-
"NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"],
800-
},
801-
{
802-
"id": "RTOS_8", "description": "ISR (Queue)",
803-
"source_dir": join(TEST_DIR, "rtos", "mbed", "isr"),
804-
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB],
805-
"automated": True,
806-
"mcu": ["LPC1768", "LPC1549", "LPC11U24", "LPC812", "LPC824", "SSCI824",
807-
"KL25Z", "KL05Z", "K22F", "K64F", "K66F", "KL43Z", "KL46Z", "HEXIWEAR",
808-
"RZ_A1H", "VK_RZ_A1H", "DISCO_F407VG", "DISCO_F429ZI", "NUCLEO_F411RE", "NUCLEO_F412ZG", "DISCO_F469NI", "NUCLEO_F410RB", "NUCLEO_F429ZI",
809-
"NUCLEO_F401RE", "NUCLEO_F334R8", "DISCO_F334C8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F070RB", "NUCLEO_F207ZG",
810-
"DISCO_L072CZ_LRWAN1", "NUCLEO_L073RZ", "NUCLEO_F072RB", "NUCLEO_F091RC", "NUCLEO_L432KC", "DISCO_L476VG", "NUCLEO_L476RG",
811-
"DISCO_F401VC", "NUCLEO_F303RE", "NUCLEO_F303K8", "MAXWSNENV", "MAX32600MBED", "NUCLEO_L152RE",
812-
"NUCLEO_F446RE", "NUCLEO_F446ZE", "NUCLEO_F103RB", "DISCO_F746NG", "NUCLEO_F746ZG", "MOTE_L152RC", "B96B_F446VE",
813-
"EFM32HG_STK3400", "EFM32PG_STK3401", "EFM32LG_STK3600", "EFM32GG_STK3700", "EFM32WG_STK3800",
814-
"NUMAKER_PFM_NUC472", "NUMAKER_PFM_M453",
815-
"NRF51822", "NRF51_DK", "SEEED_TINY_BLE", "ARM_BEETLE_SOC", "NUCLEO_F767ZI", "DISCO_F769NI"],
816-
},
817-
818643
# USB Tests
819644
# USB device test list
820645
{
@@ -857,17 +682,7 @@
857682
"source_dir": join(TEST_DIR, "usb", "device", "audio_cb"),
858683
"dependencies": [MBED_LIBRARIES, USB_LIBRARIES],
859684
},
860-
# USB host test list
861-
{
862-
"id": "USB_10", "description": "MSD",
863-
"source_dir": join(TEST_DIR, "usb", "host", "mass_storage"),
864-
"dependencies": [MBED_LIBRARIES, USB_HOST_LIBRARIES, RTOS],
865-
},
866-
{
867-
"id": "USB_11", "description": "mouse",
868-
"source_dir": join(TEST_DIR, "usb", "host", "mouse"),
869-
"dependencies": [MBED_LIBRARIES, USB_HOST_LIBRARIES, RTOS],
870-
},
685+
871686
# CMSIS DSP
872687
{
873688
"id": "CMSIS_DSP_1", "description": "FIR",
@@ -1006,7 +821,7 @@
1006821
"i2c": ["MBED_A19", "MBED_A20"],
1007822
"spi": ["MBED_A12"],
1008823
}
1009-
GROUPS["rtos"] = [test["id"] for test in TESTS if test["id"].startswith("RTOS_")]
824+
1010825
GROUPS["automated"] = [test["id"] for test in TESTS if test.get("automated", False)]
1011826
# Look for 'TEST_GROUPS' in mbed_settings.py and update the GROUPS dictionary
1012827
# with the information in test_groups if found

0 commit comments

Comments
 (0)