nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 19:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

GNUnet: Fix the way tests are run, but don't run them anyway.

Browse Source 
svn path=/nixpkgs/trunk/; revision=12776
This commit is contained in:
Ludovic Courtès 2008-08-30 21:36:28 +00:00
parent 4a5310f67b
commit 98e810a79e
6 changed files with 77 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/networking/p2p/gnunet/daemontest.patch
View File

@ -1,14 +0,0 @@
Don't run `daemontest' since it probably can't be run within the chroot
and all.
--- GNUnet-0.8.0b/src/util/os/Makefile.in 2008-08-16 02:02:23.000000000 +0200
+++ GNUnet-0.8.0b/src/util/os/Makefile.in 2008-08-23 00:39:42.000000000 +0200
@@ -37,7 +37,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
-check_PROGRAMS = daemontest$(EXEEXT) semaphoretest$(EXEEXT) \
+check_PROGRAMS = semaphoretest$(EXEEXT) \
statuscallstest$(EXEEXT)
subdir = src/util/os
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

9
pkgs/applications/networking/p2p/gnunet/default.nix
View File

@ -26,10 +26,8 @@ in
] ++ (if gtkSupport then [ gtk libglade ] else []);
patches = [
./daemontest.patch ./tmpdir.patch
./identity-test.patch ./session-tests.patch
./tmpdir.patch
./disable-http-tests.patch
./disable-broken-tests.patch
];
preConfigure = ''
@ -43,7 +41,12 @@ in
done
'';
# Tests have to be run xonce it's installed.
# FIXME: Re-enable tests when they are less broken.
#postInstall = ''
# GNUNET_PREFIX="$out" make check
#'';
doCheck = false;
meta = {

52
pkgs/applications/networking/p2p/gnunet/disable-broken-tests.patch
View File

@ -1,52 +0,0 @@
This patch disables tests that appear to be broken or cannot run in the
chroot.
* `timertest' fails without any message, which would indicate
something fishy in the test itself.
* `httptest' fails because it can't resolve some hostname.
* `hostlisttest' fails to connect to the daemon:
"Could not establish connection with peer."
diff --git a/src/util/threads/Makefile.in b/src/util/threads/Makefile.in
index d14152d..4bf6550 100644
--- a/src/util/threads/Makefile.in
+++ b/src/util/threads/Makefile.in
@@ -38,7 +38,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
check_PROGRAMS = semaphoretest$(EXEEXT) shutdowntest$(EXEEXT) \
- shutdowntest2$(EXEEXT) timertest$(EXEEXT)
+ shutdowntest2$(EXEEXT)
subdir = src/util/threads
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

71
pkgs/applications/networking/p2p/gnunet/disable-http-tests.patch
View File

@ -15,3 +15,74 @@ index b0b76a2..30a0bb5 100644
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

19
pkgs/applications/networking/p2p/gnunet/identity-test.patch
View File

@ -1,19 +0,0 @@
That test tries to load `libgnunetmodule_transport' but cannot locate it
out of the box.
diff --git a/src/applications/identity/Makefile.in b/src/applications/identity/Makefile.in
index 0bc5efc..5341f41 100644
--- a/src/applications/identity/Makefile.in
+++ b/src/applications/identity/Makefile.in
@@ -337,6 +337,11 @@ libgnunetidentity_api_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la
TESTS = $(check_PROGRAMS)
+
+# Allow `libgnunetmodule_transport' et al. to be located
+# by `GNUNET_CORE_p2p_init ()'.
+TESTS_ENVIRONMENT = LTDL_LIBRARY_PATH="$(top_builddir)/src/applications/transport:$(top_builddir)/src/transports:$(top_builddir)/src/transports/upnp:$(top_builddir)/src/applications/stats"
+
identitytest_SOURCES = \
identitytest.c

17
pkgs/applications/networking/p2p/gnunet/session-tests.patch
View File

@ -1,17 +0,0 @@
Allow session tests to locate and run `gnunetd'.
diff --git a/src/applications/session/Makefile.in b/src/applications/session/Makefile.in
index b2717f9..3478aa8 100644
--- a/src/applications/session/Makefile.in
+++ b/src/applications/session/Makefile.in
@@ -352,6 +352,10 @@ libgnunetmodule_session_la_LDFLAGS = \
-export-dynamic -avoid-version -module
@HAVE_MHD_TRUE@httptest = sessiontest_http sessiontest_nat_http
+
+# Allow `gnunetd' to be located and executed.
+TESTS_ENVIRONMENT = PATH="$(top_builddir)/src/server:$$PATH" LTDL_LIBRARY_PATH="$(top_builddir)/src/applications/identity"
+
TESTS = $(check_PROGRAMS)
sessiontest_tcp_SOURCES = \
sessiontest.c