From 61e7bd73728248a9c14ef75837e749a78bb1092e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Feb 2009 15:56:35 +0000
Subject: [PATCH] * Perl builder: run tests by default.

svn path=/nixpkgs/trunk/; revision=14041
---
 .../perl-modules/generic/builder.sh           |  6 +-----
 .../perl-modules/generic/default.nix          | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh
index 12407f6e09b..6ac5dc5f91b 100644
--- a/pkgs/development/perl-modules/generic/builder.sh
+++ b/pkgs/development/perl-modules/generic/builder.sh
@@ -2,14 +2,10 @@ source $stdenv/setup
 
 PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/site_perl"
 
-oldIFS=$IFS
-IFS=:
 perlFlags=
-for i in $PERL5LIB; do
+for i in $(IFS=:; echo $PERL5LIB); do
     perlFlags="$perlFlags -I$i"
 done
-IFS=$oldIFS
-echo "Perl flags: $perlFlags"
 
 oldPreConfigure="$preConfigure"
 preConfigure=preConfigure
diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix
index 2909664bf87..77d881b2eb0 100644
--- a/pkgs/development/perl-modules/generic/default.nix
+++ b/pkgs/development/perl-modules/generic/default.nix
@@ -2,8 +2,17 @@ perl:
 
 attrs:
 
-perl.stdenv.mkDerivation (attrs // {
-  name = "perl-" + attrs.name;
-  builder = ./builder.sh;
-  buildInputs = [(if attrs ? buildInputs then attrs.buildInputs else []) perl];
-})
+perl.stdenv.mkDerivation (
+  {
+    doCheck = true;
+    checkTarget = "test";
+  }
+  //
+  attrs
+  //
+  {
+    name = "perl-" + attrs.name;
+    builder = ./builder.sh;
+    buildInputs = [(if attrs ? buildInputs then attrs.buildInputs else []) perl];
+  }
+)