Disable HTTP tests as they seem to deadlock when building in a chroot on NixOS. diff --git a/src/transports/Makefile.in b/src/transports/Makefile.in index b0b76a2..30a0bb5 100644 --- a/src/transports/Makefile.in +++ b/src/transports/Makefile.in @@ -38,8 +38,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ check_PROGRAMS = test_udp$(EXEEXT) test_tcp$(EXEEXT) \ - test_http$(EXEEXT) testrepeat_udp$(EXEEXT) \ - testrepeat_tcp$(EXEEXT) testrepeat_http$(EXEEXT) + testrepeat_udp$(EXEEXT) \ + testrepeat_tcp$(EXEEXT) subdir = src/transports DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/src/applications/session/Makefile.in b/src/applications/session/Makefile.in index b2717f9..a048d21 100644 --- a/src/applications/session/Makefile.in +++ b/src/applications/session/Makefile.in @@ -38,7 +38,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ check_PROGRAMS = sessiontest_tcp$(EXEEXT) sessiontest_udp$(EXEEXT) \ - sessiontest_nat$(EXEEXT) $(am__EXEEXT_1) + sessiontest_nat$(EXEEXT) subdir = src/applications/session DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/src/applications/tbench/Makefile.in b/src/applications/tbench/Makefile.in index ea061bc..c6ee8f8 100644 --- a/src/applications/tbench/Makefile.in +++ b/src/applications/tbench/Makefile.in @@ -39,8 +39,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ bin_PROGRAMS = gnunet-tbench$(EXEEXT) -check_PROGRAMS = tbenchtest_tcp$(EXEEXT) tbenchtest_udp$(EXEEXT) \ - $(am__EXEEXT_1) +check_PROGRAMS = tbenchtest_tcp$(EXEEXT) tbenchtest_udp$(EXEEXT) subdir = src/applications/tbench DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/src/applications/advertising/Makefile.in b/src/applications/advertising/Makefile.in index 454fa63..af7aefb 100644 --- a/src/applications/advertising/Makefile.in +++ b/src/applications/advertising/Makefile.in @@ -38,7 +38,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ check_PROGRAMS = advertisingtest_tcp$(EXEEXT) \ - advertisingtest_udp$(EXEEXT) $(am__EXEEXT_1) + advertisingtest_udp$(EXEEXT) subdir = src/applications/advertising DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/src/applications/bootstrap_http/Makefile.in b/src/applications/bootstrap_http/Makefile.in index 29800af..ad5c6a1 100644 --- a/src/applications/bootstrap_http/Makefile.in +++ b/src/applications/bootstrap_http/Makefile.in @@ -37,7 +37,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ -check_PROGRAMS = httptest$(EXEEXT) +check_PROGRAMS = subdir = src/applications/bootstrap_http DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/src/applications/hostlist/Makefile.in b/src/applications/hostlist/Makefile.in index 126df5e..2317c60 100644 --- a/src/applications/hostlist/Makefile.in +++ b/src/applications/hostlist/Makefile.in @@ -37,7 +37,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ -check_PROGRAMS = hostlisttest$(EXEEXT) +check_PROGRAMS = subdir = src/applications/hostlist DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4