Skip to content

Commit 2ffbbdb

Browse files
nmoinvazDead2
nmoinvaz
authored and
Dead2
committed
Use correct version of gcov for cross-compilers.
1 parent 6286088 commit 2ffbbdb

File tree

1 file changed

+27
-0
lines changed

1 file changed

+27
-0
lines changed

‎.github/workflows/cmake.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,102 +152,118 @@ jobs:
152152
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DWITH_SANITIZER=Address
153153
asan-options: detect_leaks=0
154154
packages: qemu-user crossbuild-essential-armel
155+
gcov-exec: arm-linux-gnueabi-gcov
155156
codecov: ubuntu_gcc_armsf
156157

157158
- name: Ubuntu GCC ARM SF Compat No Opt UBSAN
158159
os: ubuntu-latest
159160
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF -DWITH_SANITIZER=Undefined
160161
packages: qemu-user crossbuild-essential-armel
162+
gcov-exec: arm-linux-gnueabi-gcov
161163
codecov: ubuntu_gcc_armsf_compat_no_opt
162164

163165
- name: Ubuntu GCC ARM HF ASAN
164166
os: ubuntu-latest
165167
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-armhf.cmake -DWITH_SANITIZER=Address
166168
asan-options: detect_leaks=0
167169
packages: qemu-user crossbuild-essential-armhf
170+
gcov-exec: arm-linux-gnueabihf-gcov
168171
codecov: ubuntu_gcc_armhf
169172

170173
- name: Ubuntu GCC ARM HF No ACLE ASAN
171174
os: ubuntu-latest
172175
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-armhf.cmake -DWITH_ACLE=OFF -DWITH_SANITIZER=Address
173176
asan-options: detect_leaks=0
174177
packages: qemu-user crossbuild-essential-armhf
178+
gcov-exec: arm-linux-gnueabihf-gcov
175179
codecov: ubuntu_gcc_armhf_no_acle
176180

177181
- name: Ubuntu GCC ARM HF No NEON ASAN
178182
os: ubuntu-latest
179183
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-armhf.cmake -DWITH_NEON=OFF -DWITH_SANITIZER=Address
180184
asan-options: detect_leaks=0
181185
packages: qemu-user crossbuild-essential-armhf
186+
gcov-exec: arm-linux-gnueabihf-gcov
182187
codecov: ubuntu_gcc_armhf_no_neon
183188

184189
- name: Ubuntu GCC ARM HF Compat No Opt UBSAN
185190
os: ubuntu-latest
186191
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-armhf.cmake -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF -DWITH_SANITIZER=Undefined
187192
packages: qemu-user crossbuild-essential-armhf
193+
gcov-exec: arm-linux-gnueabihf-gcov
188194
codecov: ubuntu_gcc_armhf_compat_no_opt
189195

190196
- name: Ubuntu GCC AARCH64 ASAN
191197
os: ubuntu-latest
192198
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake -DWITH_SANITIZER=Address
193199
asan-options: detect_leaks=0
194200
packages: qemu-user crossbuild-essential-arm64
201+
gcov-exec: aarch64-linux-gnu-gcov
195202
codecov: ubuntu_gcc_aarch64
196203

197204
- name: Ubuntu GCC AARCH64 No ACLE UBSAN
198205
os: ubuntu-latest
199206
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake -DWITH_ACLE=OFF -DWITH_SANITIZER=Undefined
200207
packages: qemu-user crossbuild-essential-arm64
208+
gcov-exec: aarch64-linux-gnu-gcov
201209
codecov: ubuntu_gcc_aarch64_no_acle
202210

203211
- name: Ubuntu GCC AARCH64 No NEON UBSAN
204212
os: ubuntu-latest
205213
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake -DWITH_NEON=OFF -DWITH_SANITIZER=Undefined
206214
packages: qemu-user crossbuild-essential-arm64
215+
gcov-exec: aarch64-linux-gnu-gcov
207216
codecov: ubuntu_gcc_aarch64_no_neon
208217

209218
- name: Ubuntu GCC AARCH64 Compat No Opt UBSAN
210219
os: ubuntu-latest
211220
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF -DWITH_SANITIZER=Undefined
212221
packages: qemu-user crossbuild-essential-arm64
222+
gcov-exec: aarch64-linux-gnu-gcov
213223
codecov: ubuntu_gcc_aarch64_compat_no_opt
214224

215225
- name: Ubuntu GCC MIPS
216226
os: ubuntu-latest
217227
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-mips.cmake
218228
packages: qemu-user crossbuild-essential-mips
229+
gcov-exec: mips-linux-gnu-gcov
219230
codecov: ubuntu_gcc_mips
220231

221232
- name: Ubuntu GCC MIPS64
222233
os: ubuntu-latest
223234
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-mips64.cmake
224235
packages: qemu-user crossbuild-essential-mips64
236+
gcov-exec: mips64-linux-gnuabi64-gcov
225237
codecov: ubuntu_gcc_mips64
226238

227239
- name: Ubuntu GCC PPC
228240
os: ubuntu-latest
229241
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc.cmake
230242
packages: qemu-user crossbuild-essential-powerpc
243+
gcov-exec: powerpc-linux-gnu-gcov
231244
codecov: ubuntu_gcc_ppc
232245

233246
- name: Ubuntu GCC PPC No Power8
234247
os: ubuntu-latest
235248
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc.cmake -DWITH_POWER8=OFF
236249
packages: qemu-user crossbuild-essential-powerpc
250+
gcov-exec: powerpc-linux-gnu-gcov
237251
codecov: ubuntu_gcc_ppc_no_power8
238252

239253
- name: Ubuntu GCC PPC64
240254
os: ubuntu-latest
241255
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64.cmake
242256
packages: qemu-user gcc-powerpc64-linux-gnu g++-powerpc64-linux-gnu libc-dev-ppc64-cross
243257
ldflags: -static
258+
gcov-exec: powerpc64-linux-gnu-gcov
244259
codecov: ubuntu_gcc_ppc64
245260

246261
- name: Ubuntu GCC PPC64 Power9
247262
os: ubuntu-latest
248263
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64-power9.cmake
249264
packages: qemu-user gcc-powerpc64-linux-gnu g++-powerpc64-linux-gnu libc-dev-ppc64-cross
250265
ldflags: -static
266+
gcov-exec: powerpc64-linux-gnu-gcov
251267
codecov: ubuntu_gcc_ppc64_power9
252268

253269
- name: Ubuntu Clang PPC64 Power9
@@ -259,18 +275,21 @@ jobs:
259275
os: ubuntu-latest
260276
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64le.cmake
261277
packages: qemu-user crossbuild-essential-ppc64el
278+
gcov-exec: powerpc64le-linux-gnu-gcov
262279
codecov: ubuntu_gcc_ppc64le
263280

264281
- name: Ubuntu GCC PPC64LE No VSX
265282
os: ubuntu-latest
266283
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64le-power9.cmake -DWITH_POWER8=OFF -DWITH_POWER9=OFF
267284
packages: qemu-user crossbuild-essential-ppc64el
285+
gcov-exec: powerpc64le-linux-gnu-gcov
268286
codecov: ubuntu_gcc_ppc64le_novsx
269287

270288
- name: Ubuntu GCC PPC64LE Power9
271289
os: ubuntu-latest
272290
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64le-power9.cmake
273291
packages: qemu-user crossbuild-essential-ppc64el
292+
gcov-exec: powerpc64le-linux-gnu-gcov
274293
codecov: ubuntu_gcc_ppc64le_power9
275294

276295
- name: Ubuntu Clang PPC64LE Power9
@@ -283,6 +302,7 @@ jobs:
283302
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-sparc64.cmake
284303
packages: qemu qemu-user gcc-sparc64-linux-gnu g++-sparc64-linux-gnu libc-dev-sparc64-cross
285304
ldflags: -static
305+
gcov-exec: sparc64-linux-gnu-gcov
286306
codecov: ubuntu_gcc_sparc64
287307

288308
- name: Ubuntu GCC S390X ASAN
@@ -291,6 +311,7 @@ jobs:
291311
asan-options: detect_leaks=0
292312
packages: qemu-user crossbuild-essential-s390x
293313
ldflags: -static
314+
gcov-exec: s390x-linux-gnu-gcov
294315
codecov: ubuntu_gcc_s390x
295316

296317
- name: Ubuntu GCC S390X No vectorized CRC32 ASAN
@@ -299,6 +320,7 @@ jobs:
299320
asan-options: detect_leaks=0
300321
packages: qemu-user crossbuild-essential-s390x
301322
ldflags: -static
323+
gcov-exec: s390x-linux-gnu-gcov
302324
codecov: ubuntu_gcc_s390x_no_crc32
303325

304326
- name: ${{ github.repository == 'zlib-ng/zlib-ng' && 'EL9' || 'Ubuntu' }} GCC S390X DFLTCC ASAN
@@ -311,6 +333,7 @@ jobs:
311333
packages: qemu-user gcc-s390x-linux-gnu g++-s390x-linux-gnu libc-dev-s390x-cross
312334
asan-options: detect_leaks=0
313335
ldflags: -static
336+
gcov-exec: ${{ github.repository == 'zlib-ng/zlib-ng' && 'gcov' || 's390x-linux-gnu-gcov' }}
314337
codecov: ${{ github.repository == 'zlib-ng/zlib-ng' && 'el9_gcc_s390x_dfltcc' || 'ubuntu_gcc_s390x_dfltcc' }}
315338
# The dedicated z15 test VM has 4 cores
316339
parallels-jobs: 4
@@ -324,6 +347,7 @@ jobs:
324347
-DWITH_DFLTCC_DEFLATE=ON -DWITH_DFLTCC_INFLATE=ON -DWITH_SANITIZER=Undefined
325348
packages: qemu-user gcc-s390x-linux-gnu g++-s390x-linux-gnu libc-dev-s390x-cross
326349
ldflags: -static
350+
gcov-exec: ${{ github.repository == 'zlib-ng/zlib-ng' && 'gcov' || 's390x-linux-gnu-gcov' }}
327351
codecov: ${{ github.repository == 'zlib-ng/zlib-ng' && 'el9_gcc_s390x_dfltcc' || 'ubuntu_gcc_s390x_dfltcc' }}
328352
# The dedicated z15 test VM has 4 cores
329353
parallels-jobs: 4
@@ -335,6 +359,7 @@ jobs:
335359
cmake-args: >-
336360
${{ github.repository != 'zlib-ng/zlib-ng' && '-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-s390x.cmake -DZLIB_COMPAT=ON' || '-GNinja -DWITH_SANITIZER=Memory' }}
337361
-DWITH_DFLTCC_DEFLATE=ON -DWITH_DFLTCC_INFLATE=ON
362+
gcov-exec: ${{ github.repository == 'zlib-ng/zlib-ng' && 'gcov' || 's390x-linux-gnu-gcov' }}
338363
packages: qemu-user gcc-s390x-linux-gnu g++-s390x-linux-gnu libc-dev-s390x-cross
339364
# The dedicated z15 test VM has 4 cores
340365
parallels-jobs: 4
@@ -344,6 +369,7 @@ jobs:
344369
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-mingw-i686.cmake
345370
packages: wine wine32 gcc-mingw-w64-i686 g++-mingw-w64-i686 libpcre2-8-0=10.39-3ubuntu0.1 libpcre2-8-0:i386=10.39-3ubuntu0.1 libodbc1=2.3.9-5ubuntu0.1 libodbc1:i386=2.3.9-5ubuntu0.1 libodbc2=2.3.9-5ubuntu0.1 libodbc2:i386=2.3.9-5ubuntu0.1 libodbccr2=2.3.9-5ubuntu0.1 libodbccr2:i386=2.3.9-5ubuntu0.1 libwine:i386=6.0.3~repack-1 libgphoto2-6:i386=2.5.27-1build2 libsane:i386=1.1.1-5 libgd3=2.3.0-2ubuntu2 libgd3:i386=2.3.0-2ubuntu2 libgcc-s1:i386 libstdc++6:i386
346371
ldflags: -static
372+
gcov-exec: i686-w64-mingw32-gcov-posix
347373
codecov: ubuntu_gcc_mingw_i686
348374
# Limit parallel test jobs to prevent wine errors
349375
parallels-jobs: 1
@@ -353,6 +379,7 @@ jobs:
353379
cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-mingw-x86_64.cmake
354380
packages: wine wine64 gcc-mingw-w64 g++-mingw-w64
355381
ldflags: -static
382+
gcov-exec: x86_64-w64-mingw32-gcov-posix
356383
codecov: ubuntu_gcc_mingw_x86_64
357384
# Limit parallel test jobs to prevent wine errors
358385
parallels-jobs: 1

0 commit comments

Comments
 (0)