diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-04-03 08:52:38 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-04-03 08:52:38 +0200 |
| commit | b027723e00679f2b709880407a6ff24583faeae3 (patch) | |
| tree | b972843460a92d737edb7512444b24791118f9de /tools | |
| parent | 61aad8cda475a07d579a85f209696d1ff8fd3e84 (diff) | |
| download | NetworkManager-b027723e00679f2b709880407a6ff24583faeae3.tar.gz | |
Revert "all: goodbye libnm-glib"
We need this for a little little longer :(
This reverts commit 1de8383ad9fdfc8f552117e5d109bdfa7005634b.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run-nm-test.sh | 2 | ||||
| -rwxr-xr-x | tools/test-build.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh index 135310acd0..6e7d02c845 100755 --- a/tools/run-nm-test.sh +++ b/tools/run-nm-test.sh @@ -192,7 +192,7 @@ TEST_NAME="${TEST##*/}" if [ -z "${NMTST_LAUNCH_DBUS}" ]; then # autodetect whether to launch D-Bus based on the test path. - if [[ $TEST_PATH == */libnm/tests ]]; then + if [[ $TEST_PATH == */libnm/tests || $TEST_PATH == */libnm-glib/tests ]]; then NMTST_LAUNCH_DBUS=1 else NMTST_LAUNCH_DBUS=0 diff --git a/tools/test-build.sh b/tools/test-build.sh index 17bcba7d1d..5edbcc0c16 100755 --- a/tools/test-build.sh +++ b/tools/test-build.sh @@ -40,6 +40,8 @@ if [ "${#TARGETS}" -lt 1 ]; then clients/tui/nmtui src/platform/tests/monitor src/ndisc/tests/test-ndisc-linux + libnm-util/tests/test-libnm-linking + libnm-glib/libnm-glib-test $(git grep -h '\.l\?a\>' Makefile.am | sed 's/[a-zA-Z.0-9_-/]\+/\n\0\n/g' | sort -u | grep '\.l\?a$') ) fi |