From 0fd09d11653a529817b6bcdeb60d1b11dcba137d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 20 Jan 2015 07:26:48 +0100
Subject: [PATCH 1/2] eid-{mw,viewer}: run tests

Not doing so in this case seems downright irresponsible.
---
 pkgs/tools/security/eid-mw/default.nix     | 2 ++
 pkgs/tools/security/eid-viewer/default.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 1c6573b236b..4bd0587135c 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
       --replace "modutil" "${nssTools}/bin/modutil"
   '';
 
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "Belgian electronic identity card (eID) middleware";
     homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix
index cb8b9db908b..d33ad8fa5e5 100644
--- a/pkgs/tools/security/eid-viewer/default.nix
+++ b/pkgs/tools/security/eid-viewer/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/eid-viewer --suffix LD_LIBRARY_PATH : ${pcsclite}/lib
   '';
 
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "Belgian electronic identity card (eID) viewer";
     homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;

From d14ba81572b0fb4372358b68dfba1aea34055556 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 20 Jan 2015 07:31:00 +0100
Subject: [PATCH 2/2] lz4: run tests

Data safety > valgrind.
---
 pkgs/tools/compression/lz4/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 6f7cf5b987a..c89909503d5 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, valgrind }:
 
 stdenv.mkDerivation rec {
   # The r127 source still calls itself r126 everywhere, but I'm not going to
@@ -11,10 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "0hvbbr07j4hfix4dn4xw4fsmkr5s02bj596fn0i15d1i49xby2aj";
   };
 
+  # valgrind is required only by `make test`
+  buildInputs = [ valgrind ];
+
   enableParallelBuilding = true;
 
   makeFlags = "PREFIX=$(out)";
 
+  doCheck = true;
+  checkTarget = "test";
+
   meta = with stdenv.lib; {
     description = "Extremely fast compression algorithm";
     longDescription = ''