From: Frantisek Sumsal Date: Wed, 20 Oct 2021 17:43:34 +0000 (+0200) Subject: test: don't install test-network-generator-conversion.sh w/o networkd X-Git-Tag: v250-rc1~461 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=140557021ad1a3946319fff1a87831eb02d6a1a0;p=thirdparty%2Fsystemd.git 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 ``` --- diff --git a/test/meson.build b/test/meson.build index b8335fb50f0..a5bfbb74621 100644 --- a/test/meson.build +++ b/test/meson.build @@ -100,9 +100,12 @@ if install_tests install_data('run-unit-tests.py', install_mode : 'rwxr-xr-x', install_dir : testsdir) - install_data('test-network-generator-conversion.sh', - install_mode : 'rwxr-xr-x', - install_dir : testsdir) + + if conf.get('ENABLE_NETWORKD') == 1 + install_data('test-network-generator-conversion.sh', + install_mode : 'rwxr-xr-x', + install_dir : testsdir) + endif endif ############################################################