diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-05-30 10:23:17 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-05-31 15:59:38 +0200 |
| commit | b7426e91dbcbc9080e0018a43efd0aec1f5fc5ba (patch) | |
| tree | 22481b509a9bc114f4180987877b75ce3455e77b /libnm-util | |
| parent | 7fcf33908be0ec10c7ed8a2a36bf8bf516058f5e (diff) | |
| download | NetworkManager-b7426e91dbcbc9080e0018a43efd0aec1f5fc5ba.tar.gz | |
build: use default NM_BUILD_* defines for tests
Use two common defines NM_BUILD_SRCDIR and NM_BUILD_BUILDDIR
for specifying the location of srcdir and builddir.
Note that this is only relevant for tests, as they expect
a certain layout of the directories, to find files that concern
them.
Diffstat (limited to 'libnm-util')
| -rw-r--r-- | libnm-util/tests/meson.build | 4 | ||||
| -rw-r--r-- | libnm-util/tests/test-crypto.c | 2 | ||||
| -rw-r--r-- | libnm-util/tests/test-general.c | 3 | ||||
| -rw-r--r-- | libnm-util/tests/test-secrets.c | 3 | ||||
| -rw-r--r-- | libnm-util/tests/test-setting-8021x.c | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/libnm-util/tests/meson.build b/libnm-util/tests/meson.build index 63535033f1..cf46ad1402 100644 --- a/libnm-util/tests/meson.build +++ b/libnm-util/tests/meson.build @@ -6,10 +6,8 @@ deps = [ ] cflags = common_cflags + [ - '-DBUILD_DIR="@0@"'.format(meson.current_build_dir()), - '-DTEST_CERT_DIR="@0@"'.format(test_cert_dir), '-DNETWORKMANAGER_COMPILATION_TEST', -] +] + nm_build_cflags test = 'test-libnm-linking' diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c index 83a183dd18..61bd977456 100644 --- a/libnm-util/tests/test-crypto.c +++ b/libnm-util/tests/test-crypto.c @@ -33,6 +33,8 @@ #include "nm-utils/nm-test-utils.h" +#define TEST_CERT_DIR NM_BUILD_SRCDIR"/libnm-core/tests/certs" + #if 0 static const char *pem_rsa_key_begin = "-----BEGIN RSA PRIVATE KEY-----"; static const char *pem_rsa_key_end = "-----END RSA PRIVATE KEY-----"; diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c index 74eb7cdd9a..304797a927 100644 --- a/libnm-util/tests/test-general.c +++ b/libnm-util/tests/test-general.c @@ -2428,7 +2428,8 @@ test_libnm_linking (void) int status; GError *error = NULL; - g_spawn_sync (BUILD_DIR, argv, NULL, 0 /*G_SPAWN_DEFAULT*/, + g_spawn_sync (NM_BUILD_BUILDDIR"/libnm-util/tests", + argv, NULL, 0 /*G_SPAWN_DEFAULT*/, _test_libnm_linking_setup_child_process, NULL, &out, &err, &status, &error); g_assert_no_error (error); diff --git a/libnm-util/tests/test-secrets.c b/libnm-util/tests/test-secrets.c index 2631509cf3..43c206ff76 100644 --- a/libnm-util/tests/test-secrets.c +++ b/libnm-util/tests/test-secrets.c @@ -39,7 +39,8 @@ #include "nm-utils/nm-test-utils.h" -#define TEST_NEED_SECRETS_EAP_TLS_CA_CERT TEST_CERT_DIR "/test_ca_cert.pem" +#define TEST_CERT_DIR NM_BUILD_SRCDIR"/libnm-core/tests/certs" +#define TEST_NEED_SECRETS_EAP_TLS_CA_CERT TEST_CERT_DIR "/test_ca_cert.pem" #define TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT TEST_CERT_DIR "/test_key_and_cert.pem" #define TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY TEST_CERT_DIR "/test_key_and_cert.pem" diff --git a/libnm-util/tests/test-setting-8021x.c b/libnm-util/tests/test-setting-8021x.c index a0219639c5..373b2a757d 100644 --- a/libnm-util/tests/test-setting-8021x.c +++ b/libnm-util/tests/test-setting-8021x.c @@ -29,6 +29,8 @@ #include "nm-utils/nm-test-utils.h" +#define TEST_CERT_DIR NM_BUILD_SRCDIR"/libnm-core/tests/certs" + static void compare_blob_data (const char *test, const char *key_path, |