diff --git a/ci/ciimage/opensuse/install.sh b/ci/ciimage/opensuse/install.sh index b0097172a8a9..7de18ecb646b 100755 --- a/ci/ciimage/opensuse/install.sh +++ b/ci/ciimage/opensuse/install.sh @@ -5,7 +5,7 @@ set -e source /ci/common.sh pkgs=( - python3-pip python3 python3-devel + python3-pip python3 python3-devel python3-setuptools ninja make git autoconf automake patch libjpeg-devel elfutils gcc gcc-c++ gcc-fortran gcc-objc gcc-obj-c++ vala rust bison flex curl lcov mono-core gtkmm3-devel gtest gmock protobuf-devel wxGTK3-3_2-devel gobject-introspection-devel @@ -39,7 +39,7 @@ chmod +x /ci/env_vars.sh source /ci/env_vars.sh dub_fetch urld -dub build urld --compiler=dmd +dub build --deep urld --arch=x86_64 --compiler=dmd --build=debug dub_fetch dubtestproject dub build dubtestproject:test1 --compiler=dmd dub build dubtestproject:test2 --compiler=dmd diff --git a/ci/ciimage/ubuntu-rolling/install.sh b/ci/ciimage/ubuntu-rolling/install.sh index 63e497073ad9..1706d837dc00 100755 --- a/ci/ciimage/ubuntu-rolling/install.sh +++ b/ci/ciimage/ubuntu-rolling/install.sh @@ -46,7 +46,7 @@ install_python_packages hotdoc # dub stuff dub_fetch urld -dub build urld --compiler=gdc +dub build --deep urld --arch=x86_64 --compiler=gdc --build=debug dub_fetch dubtestproject dub build dubtestproject:test1 --compiler=ldc2 dub build dubtestproject:test2 --compiler=ldc2 @@ -82,6 +82,13 @@ cp LICENSE /usr/share/doc/zig cd .. rm -rf "$ZIG_BASE" +# Hack for https://github.com/linux-test-project/lcov/issues/245 +# https://github.com/linux-test-project/lcov/commit/bf135caf5f626e02191c42bd2773e08a0bb9b7e5 +# XXX: Drop this once Ubuntu has lcov-2.1* +git clone https://github.com/linux-test-project/lcov +cd lcov +make install + # cleanup apt-get -y clean apt-get -y autoclean diff --git a/test cases/frameworks/17 mpi/meson.build b/test cases/frameworks/17 mpi/meson.build index d1d89915579f..5d233bfb217e 100644 --- a/test cases/frameworks/17 mpi/meson.build +++ b/test cases/frameworks/17 mpi/meson.build @@ -32,6 +32,16 @@ test('MPI C++', execpp, timeout: 20) if add_languages('fortran', required : false) + if method in ['auto', 'pkg-config'] + # https://bugs.debian.org/1078026 + fs = import('fs') + if fs.exists('/usr/lib/x86_64-linux-gnu/pkgconfig/ompi-fort.pc') + if fs.hash('/usr/lib/x86_64-linux-gnu/pkgconfig/ompi-fort.pc', 'md5') == '0892a93630e3d3359c43c58d5a82efc0' + error('MESON_SKIP_TEST: openmpi pkgconfig file is broken on Debian/Ubuntu') + endif + endif + endif + fc = meson.get_compiler('fortran') mpif = dependency('mpi', language : 'fortran', required: false, method : method) if not fc.links('use mpi; end', dependencies: mpif, name: 'Fortran MPI') diff --git a/test cases/frameworks/17 mpi/test.json b/test cases/frameworks/17 mpi/test.json index cbd1686121c5..3a46657ef112 100644 --- a/test cases/frameworks/17 mpi/test.json +++ b/test cases/frameworks/17 mpi/test.json @@ -2,8 +2,10 @@ "matrix": { "options": { "method": [ - { "val": "auto" }, - { "val": "pkg-config" }, + { "val": "auto", + "expect_skip_on_jobname": ["ubuntu"] }, + { "val": "pkg-config", + "expect_skip_on_jobname": ["ubuntu"] }, { "val": "config-tool", "expect_skip_on_jobname": ["fedora"] }, {