|
 |
4eda52 |
From 8efa0b5f989d977eca51617a314ec4fdc32fb3d1 Mon Sep 17 00:00:00 2001
|
|
|
4eda52 |
From: Frantisek Sumsal <frantisek@sumsal.cz>
|
|
|
4eda52 |
Date: Wed, 20 Oct 2021 19:43:34 +0200
|
|
|
4eda52 |
Subject: [PATCH] test: don't install test-network-generator-conversion.sh w/o
|
|
|
4eda52 |
networkd
|
|
|
4eda52 |
|
|
|
4eda52 |
otherwise TEST-02 will fail:
|
|
|
4eda52 |
|
|
|
4eda52 |
```
|
|
|
4eda52 |
=== Failed test log ===
|
|
|
4eda52 |
--- test-network-generator-conversion.sh begin ---
|
|
|
4eda52 |
+ [[ -n '' ]]
|
|
|
4eda52 |
+ [[ -x /usr/lib/systemd/systemd-network-generator ]]
|
|
|
4eda52 |
+ [[ -x /lib/systemd/systemd-network-generator ]]
|
|
|
4eda52 |
+ exit 1
|
|
|
4eda52 |
--- test-network-generator-conversion.sh end ---
|
|
|
4eda52 |
```
|
|
|
4eda52 |
|
|
|
4eda52 |
Before:
|
|
|
4eda52 |
```
|
|
|
4eda52 |
$ meson build -Dnetworkd=false -Dinstall-tests=true
|
|
|
4eda52 |
$ ninja -C build
|
|
|
4eda52 |
$ DESTDIR=$PWD/test-install ninja -C build install
|
|
|
4eda52 |
$ find test-install/ -name test-network-generator-conversion.sh
|
|
|
4eda52 |
test-install/usr/lib/systemd/tests/test-network-generator-conversion.sh
|
|
|
4eda52 |
```
|
|
|
4eda52 |
|
|
|
4eda52 |
After:
|
|
|
4eda52 |
```
|
|
|
4eda52 |
$ find test-install/ -name test-network-generator-conversion.sh
|
|
|
4eda52 |
<no output>
|
|
|
4eda52 |
```
|
|
|
4eda52 |
|
|
|
4eda52 |
(cherry picked from commit 140557021ad1a3946319fff1a87831eb02d6a1a0)
|
|
|
4eda52 |
|
|
|
4eda52 |
Related: #2017035
|
|
|
4eda52 |
---
|
|
|
4eda52 |
test/meson.build | 9 ++++++---
|
|
|
4eda52 |
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
4eda52 |
|
|
|
4eda52 |
diff --git a/test/meson.build b/test/meson.build
|
|
|
4eda52 |
index 47c7f4d49a..27b37a9ae7 100644
|
|
|
4eda52 |
--- a/test/meson.build
|
|
|
4eda52 |
+++ b/test/meson.build
|
|
|
4eda52 |
@@ -98,9 +98,12 @@ if install_tests
|
|
|
4eda52 |
install_data('run-unit-tests.py',
|
|
|
4eda52 |
install_mode : 'rwxr-xr-x',
|
|
|
4eda52 |
install_dir : testsdir)
|
|
|
4eda52 |
- install_data('test-network-generator-conversion.sh',
|
|
|
4eda52 |
- install_mode : 'rwxr-xr-x',
|
|
|
4eda52 |
- install_dir : testsdir)
|
|
|
4eda52 |
+
|
|
|
4eda52 |
+ if conf.get('ENABLE_NETWORKD') == 1
|
|
|
4eda52 |
+ install_data('test-network-generator-conversion.sh',
|
|
|
4eda52 |
+ install_mode : 'rwxr-xr-x',
|
|
|
4eda52 |
+ install_dir : testsdir)
|
|
|
4eda52 |
+ endif
|
|
|
4eda52 |
endif
|
|
|
4eda52 |
|
|
|
4eda52 |
############################################################
|