Core: fix Core test to allow run in git bash (d52f8b79) · Commits · Wenxi XU / Cmsis 6

CMSIS/Core/Test/README.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ In case of failing test cases, one can run a single test case with verbose outpu
		PASS: CMSIS-Core :: src/apsr.c (1 of 1)
		Script:
		--
		: 'RUN: at line 2'; arm-none-eabi-gcc -mcpu=cortex-m3 -mfloat-abi=soft -O1 -I ../Include -D CORE_HEADER=\"core_cm3.h\" -c -D __CM3_REV=0x0000U -D __MPU_PRESENT=1U -D __VTOR_PRESENT=1U -D __NVIC_PRIO_BITS=3U -D __Vendor_SysTickConfig=0U -o ./src/Output/apsr.c.o ./src/apsr.c; llvm-objdump --mcpu=cortex-m3 -d ./src/Output/apsr.c.o \| FileCheck --allow-unused-prefixes --check-prefixes CHECK,CHECK-THUMB ./src/apsr.c
		: 'RUN: at line 2'; arm-none-eabi-gcc -mcpu=cortex-m3 -mfloat-abi=soft -O1 -I ../Include -D CORE_HEADER="core_cm3.h" -c -D __CM3_REV=0x0000U -D __MPU_PRESENT=1U -D __VTOR_PRESENT=1U -D __NVIC_PRIO_BITS=3U -D __Vendor_SysTickConfig=0U -o ./src/Output/apsr.c.o ./src/apsr.c; llvm-objdump --mcpu=cortex-m3 -d ./src/Output/apsr.c.o \| FileCheck --allow-unused-prefixes --check-prefixes CHECK,CHECK-THUMB ./src/apsr.c
		--
		Exit Code: 0
		:

CMSIS/Core/Test/lit.cfg.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -681,7 +681,7 @@ class Toolchain_AC6(Toolchain):
		def get_ccflags(self):
		ccflags = [
		'--target=arm-arm-none-eabi', f'-mcpu={DEVICES[self.device]["mcpu"]}', f'-mfpu={DEVICES[self.device]["mfpu"]}',
		self.OPTIMIZE[self.optimize], '-I', os.path.abspath('../Include'), '-c', '-D', f'CORE_HEADER=\\"{DEVICES[device]["header"]}\\"']
		self.OPTIMIZE[self.optimize], '-I', os.path.abspath('../Include'), '-c', '-D', f'CORE_HEADER="{DEVICES[device]["header"]}"']
		if device.endswith('S') and not device.endswith('NS'):
		ccflags += ["-mcmse"]
		ccflags += list(sum([('-D', f'{define}={value}') for (define, value) in DEVICES[self.device]['defines'].items()], ()))
		@@ -709,7 +709,7 @@ class Toolchain_GCC(Toolchain):
		ccflags = [
		f'-mcpu={DEVICES[self.device]["mcpu"]}', f'-mfloat-abi={floatabi}',
		self.OPTIMIZE[self.optimize], '-I', os.path.abspath('../Include'),
		'-D', f'CORE_HEADER=\\"{DEVICES[device]["header"]}\\"', '-c']
		'-D', f'CORE_HEADER="{DEVICES[device]["header"]}"', '-c']
		if DEVICES[self.device]["mfpu"] != "none":
		ccflags += [f'-mfpu={DEVICES[self.device]["mfpu"]}']
		if device.endswith('S') and not device.endswith('NS'):
		@@ -765,7 +765,7 @@ class Toolchain_Clang(Toolchain):
		ccflags = [
		f'--target={self.TARGET[self.device]}', self.OPTIMIZE[self.optimize],
		f'-mcpu={DEVICES[self.device]["mcpu"]}', f'-mfpu={DEVICES[self.device]["mfpu"]}',
		'-I', os.path.abspath('../Include'), '-c', '-D', f'CORE_HEADER=\\"{DEVICES[device]["header"]}\\"']
		'-I', os.path.abspath('../Include'), '-c', '-D', f'CORE_HEADER="{DEVICES[device]["header"]}"']
		if device.endswith('S') and not device.endswith('NS'):
		ccflags += ["-mcmse"]
		ccflags += list(sum([('-D', f'{define}={value}') for (define, value) in DEVICES[self.device]['defines'].items()], ()))

Admin message