Skip to content

Commit b1d9436

Browse files
committed
MacOS needs to call the LLVM tools. Windows coverage was not checking in all the right places for the assember for ARM64.
1 parent 9dc9b48 commit b1d9436

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

.github/workflows/coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ jobs:
159159

160160
- name: Generate Coverage Report
161161
run: |
162-
lcov --capture --directory build --output-file coverage.info
163-
lcov --remove coverage.info '/usr/*' --output-file coverage.info
162+
lcov --gcov-tool "$(which llvm-cov) gcov" --capture --directory build --output-file coverage.info
163+
lcov --gcov-tool "$(which llvm-cov) gcov" --remove coverage.info '/usr/*' --output-file coverage.info
164164
genhtml coverage.info --output-directory docs/coverage --title "yafl Code Coverage"
165165
166166
- name: Generate Coverage Badge

toolchains/aarch64-pc-windows-msvc.cmake

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ set(ASM_FILES
88
src/asm/arm64/jump_arm64_aapcs_pe_armasm.asm
99
)
1010

11-
find_program(ARMASM64 armasm64.exe REQUIRED)
11+
find_program(ARMASM64
12+
NAMES armasm64.exe armasm64
13+
HINTS
14+
"${CMAKE_C_COMPILER}/.."
15+
"$ENV{VCToolsInstallDir}/bin/Hostarm64/arm64"
16+
"$ENV{VCToolsInstallDir}/bin/Hostx64/arm64"
17+
REQUIRED
18+
)
1219

1320
# Create custom commands for each ARM64 assembly file
1421
set(ARM64_ASM_OBJECTS "")

0 commit comments

Comments
 (0)