[network-manager-vpnc] properties/tests: use different TMPDIR for testing libnm/libnm-glib based tests
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-vpnc] properties/tests: use different TMPDIR for testing libnm/libnm-glib based tests
- Date: Thu, 6 Oct 2016 11:59:58 +0000 (UTC)
commit e70e6d2ab88f0673e7211914155f57f34c1b4bef
Author: Thomas Haller <thaller redhat com>
Date: Thu Oct 6 13:52:52 2016 +0200
properties/tests: use different TMPDIR for testing libnm/libnm-glib based tests
We compile two versions of the properties tests from the same source file:
one for libnm and one for legacy libnm-glib. When running them in parallel
with `make -j 4 check`, we must ensure that the tests use different temporary
directories.
https://bugzilla.gnome.org/show_bug.cgi?id=772471
properties/tests/test-import-export.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/properties/tests/test-import-export.c b/properties/tests/test-import-export.c
index ae3e6a6..c26ca5d 100644
--- a/properties/tests/test-import-export.c
+++ b/properties/tests/test-import-export.c
@@ -34,7 +34,12 @@
#include "nm-utils/nm-test-utils.h"
#define SRCDIR TEST_SRCDIR"/pcf"
-#define TMPDIR TEST_BUILDDIR"/pcf-tmp"
+
+#ifdef NM_VPN_OLD
+#define TMPDIR TEST_BUILDDIR"/pcf-tmp-old"
+#else
+#define TMPDIR TEST_BUILDDIR"/pcf-tmp-new"
+#endif
/*****************************************************************************/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]