diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-08-13 14:23:24 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-08-17 15:18:06 +0200 |
| commit | 00e3fc036addc281cc34b432bc7c4b06c7912f80 (patch) | |
| tree | a49fbe8cc6610120bac75f97d6d004785ac34b2e | |
| parent | c92a3ca5c2cd5366714da916e4f31f606901b727 (diff) | |
| download | NetworkManager-00e3fc036addc281cc34b432bc7c4b06c7912f80.tar.gz | |
clients/tests: ensure that we run nmcli before client tests for LTO
nmcli is build with libtool, so "clients/cli/nmcli" is really a shell script
that invokes the real nmcli (at "clients/cli/.libs/nmcli").
When building with LTO for some reasons "clients/cli/nmcli" still
does some build steps during the first invocation.
That means, if we run `make check-local-clients-tests-test-client` it
would first do the final build step. This takes a while, and the test
times out (worse, we do that build step many times in parallel).
Avoid that by invoking "clients/cli/nmcli" first.
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 0f2f5da0f7..9808c25478 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4953,6 +4953,7 @@ endif check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-client.py mkdir -p "$(builddir)/clients/tests/" + "$(builddir)/clients/cli/nmcli" --version GI_TYPELIB_PATH="$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}" \ LD_LIBRARY_PATH="$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \ NM_TEST_CLIENT_BUILDDIR="$(abs_builddir)" \ |