guix-env: some update.

[oweals/gnunet.git] / src / testing / Makefile.am

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 859d950fae0f837991663dbfc1f12c2bc5c14a1b..727bfb13415f2ac3868c450f3f9cdaeadf06d0a2 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -16,13 +16,13 @@ dist_pkgcfg_DATA = \
   testing.conf
 
 lib_LTLIBRARIES = \
-  libgnunettesting.la 
+  libgnunettesting.la
 
 libgnunettesting_la_SOURCES = \
-  testing.c  
+  testing.c
 libgnunettesting_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/arm/libgnunetarm.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
  $(LTLIBINTL)
 libgnunettesting_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
@@ -35,7 +35,7 @@ noinst_PROGRAMS = \
  list-keys
 
 gnunet_testing_SOURCES = \
- gnunet-testing.c         
+ gnunet-testing.c
 gnunet_testing_LDADD = \
  libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la \
@@ -55,8 +55,8 @@ check_PROGRAMS = \
  test_testing_peerstartup2 \
  test_testing_sharedservices
 
-if ENABLE_TEST_RUN 
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = \
  test_testing_portreservation \
  test_testing_peerstartup \
@@ -96,4 +96,3 @@ test_testing_sharedservices_LDADD = \
 
 EXTRA_DIST = \
   test_testing_defaults.conf
-