summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-07-02 17:49:16 +0200
committerThomas Haller <thaller@redhat.com>2015-07-02 17:52:39 +0200
commitf41fc2f33e6f1d92090553ed785672c760256853 (patch)
treeba5e171694df9a38df219362005922101441ecc6
parent17216ed453c366e961b52dff94e413ba3080c1e3 (diff)
downloadNetworkManager-f41fc2f33e6f1d92090553ed785672c760256853.tar.gz
config/test: fix test failiure due to invalid paths for out-of-tree build
Fixes: 25b23f931ec0d26b3f68720e8d9ab299d4c43cdb
-rw-r--r--src/tests/config/Makefile.am3
-rw-r--r--src/tests/config/test-config.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/tests/config/Makefile.am b/src/tests/config/Makefile.am
index 42c6b9a1b0..39e5a7f90a 100644
--- a/src/tests/config/Makefile.am
+++ b/src/tests/config/Makefile.am
@@ -10,7 +10,8 @@ AM_CPPFLAGS = \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
- -DSRCDIR=\""$(srcdir)"\"
+ -DSRCDIR=\""$(srcdir)"\" \
+ -DBUILDDIR=\""$(builddir)"\"
noinst_PROGRAMS = \
test-config
diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c
index 33b66d614f..f9aff5d97b 100644
--- a/src/tests/config/test-config.c
+++ b/src/tests/config/test-config.c
@@ -701,8 +701,8 @@ static void
test_config_set_values (void)
{
gs_unref_object NMConfig *config = NULL;
- const char *CONFIG_USER = SRCDIR"/test-set-values-user.conf";
- const char *CONFIG_INTERN = SRCDIR"/test-set-values-intern.conf";
+ const char *CONFIG_USER = BUILDDIR"/test-set-values-user.conf";
+ const char *CONFIG_INTERN = BUILDDIR"/test-set-values-intern.conf";
const char *atomic_section_prefixes[] = {
"atomic-prefix-1.",
"atomic-prefix-2.",