[network-manager-openvpn] properties/tests: use different TMPDIR for testing libnm/libnm-glib based tests

[Thomas Haller <thaller src gnome org>]

commit 94499b2d6203ec321b1417369278ca3cebe0c401
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=772464

 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 6463b10..a8ea385 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"/conf"
-#define TMPDIR TEST_BUILDDIR"/conf-tmp"
+
+#ifdef NM_VPN_OLD
+#define TMPDIR TEST_BUILDDIR"/conf-tmp-old"
+#else
+#define TMPDIR TEST_BUILDDIR"/conf-tmp-new"
+#endif
 
 /*****************************************************************************/