diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-03-04 13:19:00 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-03-04 13:19:00 +0000 |
| commit | 69e259eaf2e6865a50a562581bdc084074f57c4a (patch) | |
| tree | 363cb95b48d7e3d5b5ca9a21fbd69d63428e38c2 /pkgs/servers/http | |
| parent | cc0293330561fc9d7d3fc2ab86db0912afd98404 (diff) | |
| download | nixlib-69e259eaf2e6865a50a562581bdc084074f57c4a.tar nixlib-69e259eaf2e6865a50a562581bdc084074f57c4a.tar.gz nixlib-69e259eaf2e6865a50a562581bdc084074f57c4a.tar.bz2 nixlib-69e259eaf2e6865a50a562581bdc084074f57c4a.tar.lz nixlib-69e259eaf2e6865a50a562581bdc084074f57c4a.tar.xz nixlib-69e259eaf2e6865a50a562581bdc084074f57c4a.tar.zst nixlib-69e259eaf2e6865a50a562581bdc084074f57c4a.zip | |
GNU MyServer: Kill the test suite.
svn path=/nixpkgs/trunk/; revision=26161
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/myserver/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 776c121399e2..3f491810819b 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -1,8 +1,8 @@ { fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls -, libxml2, zlib, guile, texinfo, cppunit, xz }: +, libxml2, zlib, guile, texinfo, cppunit, xz, psmisc }: let version = "0.10"; in - stdenv.mkDerivation rec { + stdenv.mkDerivation (rec { name = "myserver-${version}"; src = fetchurl { @@ -42,3 +42,11 @@ let version = "0.10"; in platforms = stdenv.lib.platforms.gnu; }; } + + // + + # On GNU/Linux the `test_suite' process sometimes stays around, so + # forcefully terminate it. + (if stdenv.isLinux + then { postCheck = "${psmisc}/bin/killall test_suite || true"; } + else { })) |