diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-06-06 16:02:47 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-06-06 16:35:23 +0200 |
| commit | b769b4dfcba955918abe7d3261ee9355a24c0ba0 (patch) | |
| tree | e745262d7ae278db7e0e1ec7aceebac5ac729a84 | |
| parent | 2822f92434e19ebd25b69672bc996fc8311ae929 (diff) | |
| download | NetworkManager-b769b4dfcba955918abe7d3261ee9355a24c0ba0.tar.gz | |
tests: use absolute path for certs test directory
Allows to run the test without first switching directory
./libnm-core/tests/test-secrets
| -rw-r--r-- | libnm-core/tests/Makefile.am | 4 | ||||
| -rw-r--r-- | libnm-util/tests/Makefile.am | 2 | ||||
| -rw-r--r-- | src/supplicant-manager/tests/Makefile.am | 2 | ||||
| -rw-r--r-- | src/supplicant-manager/tests/test-supplicant-config.c | 6 |
4 files changed, 6 insertions, 8 deletions
diff --git a/libnm-core/tests/Makefile.am b/libnm-core/tests/Makefile.am index 1926c86f53..485fd1410c 100644 --- a/libnm-core/tests/Makefile.am +++ b/libnm-core/tests/Makefile.am @@ -9,8 +9,6 @@ BUILT_SOURCES = $(GLIB_GENERATED) if ENABLE_TESTS -certsdir = $(srcdir)/certs - AM_CPPFLAGS = \ -I${top_srcdir}/shared \ -I${top_builddir}/shared \ @@ -18,7 +16,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libnm-core \ -DNETWORKMANAGER_COMPILATION \ $(GLIB_CFLAGS) \ - -DTEST_CERT_DIR=\"$(certsdir)\" + -DTEST_CERT_DIR=\"$(abs_srcdir)/certs\" noinst_PROGRAMS = \ test-compare \ diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am index 30adafcfd1..1076a933e6 100644 --- a/libnm-util/tests/Makefile.am +++ b/libnm-util/tests/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ -DBUILD_DIR=\"$(abs_builddir)\" \ - -DTEST_CERT_DIR=\"$(top_srcdir)/libnm-core/tests/certs/\" + -DTEST_CERT_DIR=\"$(abs_top_srcdir)/libnm-core/tests/certs\" @VALGRIND_RULES@ TESTS = \ diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am index 6672c67370..3ab9122e81 100644 --- a/src/supplicant-manager/tests/Makefile.am +++ b/src/supplicant-manager/tests/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/supplicant-manager \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - -DTEST_CERT_DIR=\"$(srcdir)/certs/\" \ + -DTEST_CERT_DIR=\"$(abs_srcdir)/certs\" \ $(GLIB_CFLAGS) noinst_PROGRAMS = test-supplicant-config diff --git a/src/supplicant-manager/tests/test-supplicant-config.c b/src/supplicant-manager/tests/test-supplicant-config.c index fd603f3b81..0e53080273 100644 --- a/src/supplicant-manager/tests/test-supplicant-config.c +++ b/src/supplicant-manager/tests/test-supplicant-config.c @@ -530,9 +530,9 @@ test_wifi_eap (void) s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); nm_connection_add_setting (connection, NM_SETTING (s_8021x)); nm_setting_802_1x_add_eap_method (s_8021x, "tls"); - nm_setting_802_1x_set_client_cert (s_8021x, TEST_CERT_DIR "test-cert.p12", NM_SETTING_802_1X_CK_SCHEME_PATH, NULL, NULL); - nm_setting_802_1x_set_ca_cert (s_8021x, TEST_CERT_DIR "test-ca-cert.pem", NM_SETTING_802_1X_CK_SCHEME_PATH, NULL, NULL); - nm_setting_802_1x_set_private_key (s_8021x, TEST_CERT_DIR "test-cert.p12", NULL, NM_SETTING_802_1X_CK_SCHEME_PATH, NULL, NULL); + nm_setting_802_1x_set_client_cert (s_8021x, TEST_CERT_DIR "/test-cert.p12", NM_SETTING_802_1X_CK_SCHEME_PATH, NULL, NULL); + nm_setting_802_1x_set_ca_cert (s_8021x, TEST_CERT_DIR "/test-ca-cert.pem", NM_SETTING_802_1X_CK_SCHEME_PATH, NULL, NULL); + nm_setting_802_1x_set_private_key (s_8021x, TEST_CERT_DIR "/test-cert.p12", NULL, NM_SETTING_802_1X_CK_SCHEME_PATH, NULL, NULL); /* IP4 setting */ s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new (); |