Skip to content

Commit c53c0f5

Browse files
Restructure Core tests
- Move tests into src subfolder - Use temp directory for intermediate object files - Include test report in matrix summary
1 parent f44ff7b commit c53c0f5

59 files changed

Lines changed: 127 additions & 122 deletions

Some content is hidden

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

CMSIS/Core/Test/README.md

CMSIS/Core/Test/bkpt.c

Lines changed: 0 additions & 10 deletions
This file was deleted.

CMSIS/Core/Test/build.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,24 @@ class OptimizationAxis(Enum):
5959
SIZE = ('size')
6060

6161

62+
def timestamp():
63+
return datetime.now().strftime('%Y%m%d%H%M%S')
64+
65+
6266
@matrix_action
63-
def lit(config):
67+
def lit(config, results):
6468
"""Run tests for the selected configurations using llvm's lit."""
6569
yield run_lit(config.compiler[0], config.device[1], config.optimize[0])
70+
results[0].test_report.write(f"lit-{config.compiler[0]}-{config.optimize[0]}-{config.device[1]}-{timestamp()}.xunit")
6671

6772

6873
def timestamp():
6974
return datetime.now().strftime('%Y%m%d%H%M%S')
7075

7176

72-
@matrix_command()
77+
@matrix_command(test_report=FileReport(f"lit.xml") | JUnitReport())
7378
def run_lit(toolchain, device, optimize):
74-
return ["lit", "--xunit-xml-output", f"lit-{toolchain}-{optimize}-{device}.xunit", "-D", f"toolchain={toolchain}", "-D", f"device={device}", "-D", f"optimize={optimize}", "." ]
79+
return ["lit", "--xunit-xml-output", f"lit.xml", "-D", f"toolchain={toolchain}", "-D", f"device={device}", "-D", f"optimize={optimize}", "src" ]
7580

7681

7782
@matrix_filter

CMSIS/Core/Test/dmb.c

Lines changed: 0 additions & 11 deletions
This file was deleted.

CMSIS/Core/Test/dsb.c

Lines changed: 0 additions & 11 deletions
This file was deleted.

CMSIS/Core/Test/isb.c

Lines changed: 0 additions & 11 deletions
This file was deleted.

CMSIS/Core/Test/lit.cfg.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ def get_cc(self):
681681
def get_ccflags(self):
682682
ccflags = [
683683
'--target=arm-arm-none-eabi', f'-mcpu={DEVICES[self.device]["mcpu"]}', f'-mfpu={DEVICES[self.device]["mfpu"]}',
684-
self.OPTIMIZE[self.optimize], '-I', '../Include', '-c', '-D', f'CORE_HEADER=\\"{DEVICES[device]["header"]}\\"']
684+
self.OPTIMIZE[self.optimize], '-I', os.path.abspath('../Include'), '-c', '-D', f'CORE_HEADER=\\"{DEVICES[device]["header"]}\\"']
685685
if device.endswith('S') and not device.endswith('NS'):
686686
ccflags += ["-mcmse"]
687687
ccflags += list(sum([('-D', f'{define}={value}') for (define, value) in DEVICES[self.device]['defines'].items()], ()))
@@ -708,7 +708,7 @@ def get_ccflags(self):
708708
floatabi='hard'
709709
ccflags = [
710710
f'-mcpu={DEVICES[self.device]["mcpu"]}', f'-mfloat-abi={floatabi}',
711-
self.OPTIMIZE[self.optimize], '-I', '../Include',
711+
self.OPTIMIZE[self.optimize], '-I', os.path.abspath('../Include'),
712712
'-D', f'CORE_HEADER=\\"{DEVICES[device]["header"]}\\"', '-c']
713713
if DEVICES[self.device]["mfpu"] != "none":
714714
ccflags += [f'-mfpu={DEVICES[self.device]["mfpu"]}']
@@ -765,7 +765,7 @@ def get_ccflags(self):
765765
ccflags = [
766766
f'--target={self.TARGET[self.device]}', self.OPTIMIZE[self.optimize],
767767
f'-mcpu={DEVICES[self.device]["mcpu"]}', f'-mfpu={DEVICES[self.device]["mfpu"]}',
768-
'-I', '../Include', '-c', '-D', f'CORE_HEADER=\\"{DEVICES[device]["header"]}\\"']
768+
'-I', os.path.abspath('../Include'), '-c', '-D', f'CORE_HEADER=\\"{DEVICES[device]["header"]}\\"']
769769
if device.endswith('S') and not device.endswith('NS'):
770770
ccflags += ["-mcmse"]
771771
ccflags += list(sum([('-D', f'{define}={value}') for (define, value) in DEVICES[self.device]['defines'].items()], ()))

CMSIS/Core/Test/nop.c

Lines changed: 0 additions & 10 deletions
This file was deleted.

CMSIS/Core/Test/sev.c

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: thumbv6m
2-
// RUN: %cc% %ccflags% %ccout% %s.o %s; llvm-objdump --mcpu=%mcpu% -d %s.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s
2+
// RUN: %cc% %ccflags% %ccout% %T/%basename_t.o %s; llvm-objdump --mcpu=%mcpu% -d %T/%basename_t.o | FileCheck --allow-unused-prefixes --check-prefixes %prefixes% %s
33

44
#include "cmsis_compiler.h"
55

0 commit comments

Comments
 (0)