Author: ludo
Date: Fri Mar 4 13:19:00 2011
New Revision: 26161
URL: https://svn.nixos.org/websvn/nix/?rev=26161&sc=1
Log:
GNU MyServer: Kill the test suite.
Modified:
nixpkgs/trunk/pkgs/servers/http/myserver/default.nix
Modified: nixpkgs/trunk/pkgs/servers/http/myserver/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/http/myserver/default.nix Fri Mar 4
13:18:56 2011 (r26160)
+++ nixpkgs/trunk/pkgs/servers/http/myserver/default.nix Fri Mar 4
13:19:00 2011 (r26161)
@@ -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 @@
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 { }))
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
