guix-env: some update.

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

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 4f1d8fe17630ffd1a3d890461e7757c0954c754b..727bfb13415f2ac3868c450f3f9cdaeadf06d0a2 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -1,4 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@ -15,41 +16,36 @@ 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) \
  -version-info 2:0:1
 
 bin_PROGRAMS = \
- gnunet-testing-run-service \
  gnunet-testing
 
+noinst_PROGRAMS = \
+ list-keys
 
-gnunet_testing_run_service_SOURCES = \
- gnunet-testing-run-service.c
-
-gnunet_testing_run_service_LDADD = \
+gnunet_testing_SOURCES = \
+ gnunet-testing.c
+gnunet_testing_LDADD = \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
  $(GN_LIBINTL)
-gnunet_testing_run_service_DEPENDENCIES = \
-  libgnunettesting.la
 
-gnunet_testing_SOURCES = \
- gnunet-testing.c         
-gnunet_testing_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+list_keys_SOURCES = \
+ list-keys.c
+list_keys_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
-gnunet_testing_DEPENDENCIES = \
- libgnunettesting.la
 
 
 check_PROGRAMS = \
@@ -59,7 +55,8 @@ check_PROGRAMS = \
  test_testing_peerstartup2 \
  test_testing_sharedservices
 
-if ENABLE_TEST_RUN 
+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 \
@@ -70,44 +67,32 @@ endif
 test_testing_portreservation_SOURCES = \
  test_testing_portreservation.c
 test_testing_portreservation_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_peerstartup_SOURCES = \
  test_testing_peerstartup.c
 test_testing_peerstartup_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_peerstartup2_SOURCES = \
  test_testing_peerstartup2.c
 test_testing_peerstartup2_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_servicestartup_SOURCES = \
  test_testing_servicestartup.c
 test_testing_servicestartup_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_sharedservices_SOURCES = \
  test_testing_sharedservices.c
 test_testing_sharedservices_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-
-
 EXTRA_DIST = \
   test_testing_defaults.conf
-
-
-noinst_PROGRAMS = \
-  bindfail bindok
-
-bindok_SOURCES = bindok.c
-
-bindfail_SOURCES = bindfail.c
-bindfail_LDADD = $(top_builddir)/src/util/libgnunetutil.la
-