1
0
mirror of https://github.com/systemd/systemd synced 2026-03-31 20:24:50 +02:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Luca Boccassi
0ad536c16a CI: disable code coverage in GH Action
It is now ran on the nightly CentOS build, so that it can cover
integration tests too, and not just unit tests. It's nightly as
it considerably increases the integration test runtime, so it's
not appropriate for all PRs.
2021-10-21 00:10:52 +01:00
Frantisek Sumsal
140557021a test: don't install test-network-generator-conversion.sh w/o networkd
otherwise TEST-02 will fail:

```
=== Failed test log ===
--- test-network-generator-conversion.sh begin ---
+ [[ -n '' ]]
+ [[ -x /usr/lib/systemd/systemd-network-generator ]]
+ [[ -x /lib/systemd/systemd-network-generator ]]
+ exit 1
--- test-network-generator-conversion.sh end ---
```

Before:
```
$ meson build -Dnetworkd=false -Dinstall-tests=true
$ ninja -C build
$ DESTDIR=$PWD/test-install ninja -C build install
$ find test-install/ -name test-network-generator-conversion.sh
test-install/usr/lib/systemd/tests/test-network-generator-conversion.sh
```

After:
```
$ find test-install/ -name test-network-generator-conversion.sh
<no output>
```
2021-10-20 22:04:45 +01:00
3 changed files with 6 additions and 18 deletions

View File

@ -9,7 +9,6 @@ ADDITIONAL_DEPS=(
expect expect
fdisk fdisk
jekyll jekyll
lcov
libfdisk-dev libfdisk-dev
libfido2-dev libfido2-dev
libp11-kit-dev libp11-kit-dev
@ -48,17 +47,9 @@ for phase in "${PHASES[@]}"; do
# The docs build is slow and is not affected by compiler/flags, so do it just once # The docs build is slow and is not affected by compiler/flags, so do it just once
MESON_ARGS+=(-Dman=true) MESON_ARGS+=(-Dman=true)
fi fi
if [[ "$phase" = "RUN_GCC" ]]; then
MESON_ARGS+=(-Db_coverage=true)
# See FIXME below
(set +x; while :; do echo -ne "\n[WATCHDOG] $(date)\n"; sleep 30; done) &
fi
meson --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true "${MESON_ARGS[@]}" build meson --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true "${MESON_ARGS[@]}" build
ninja -C build -v ninja -C build -v
meson test -C build --print-errorlogs meson test -C build --print-errorlogs
if [[ "$phase" = "RUN_GCC" ]]; then
ninja -C build coverage
fi
;; ;;
RUN_ASAN_UBSAN|RUN_GCC_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN) RUN_ASAN_UBSAN|RUN_GCC_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN)
MESON_ARGS=(--optimization=1) MESON_ARGS=(--optimization=1)

View File

@ -29,9 +29,3 @@ jobs:
- name: Build & test (${{ matrix.run_phase }}) - name: Build & test (${{ matrix.run_phase }})
run: sudo -E .github/workflows/unit_tests.sh RUN_${{ matrix.run_phase }} run: sudo -E .github/workflows/unit_tests.sh RUN_${{ matrix.run_phase }}
if: github.event_name == 'pull_request' || matrix.run_phase == 'GCC' if: github.event_name == 'pull_request' || matrix.run_phase == 'GCC'
- name: Coveralls
if: matrix.run_phase == 'GCC' && github.repository == 'systemd/systemd'
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: ./build/meson-logs/coverage.info

View File

@ -100,10 +100,13 @@ if install_tests
install_data('run-unit-tests.py', install_data('run-unit-tests.py',
install_mode : 'rwxr-xr-x', install_mode : 'rwxr-xr-x',
install_dir : testsdir) install_dir : testsdir)
if conf.get('ENABLE_NETWORKD') == 1
install_data('test-network-generator-conversion.sh', install_data('test-network-generator-conversion.sh',
install_mode : 'rwxr-xr-x', install_mode : 'rwxr-xr-x',
install_dir : testsdir) install_dir : testsdir)
endif endif
endif
############################################################ ############################################################