[Nix-commits] SVN commit: nix - r33967 - in nixpkgs/branches/stdenv-updates/pkgs: stdenv/generic tools/package-management/nix

[Eelco Dolstra]

Author: eelco
Date: Tue May  1 21:00:30 2012
New Revision: 33967
URL: https://nixos.org/websvn/nix/?rev=33967&sc=1

Log:
* Add an installCheckPhase.

Modified:
   nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh
   
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/unstable.nix

Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh        Tue May 
 1 20:31:01 2012        (r33966)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh        Tue May 
 1 21:00:30 2012        (r33967)
@@ -767,6 +767,19 @@
 }
 
 
+installCheckPhase() {
+    runHook preInstallCheck
+
+    echo "installcheck flags: $makeFlags ${makeFlagsArray[@]} 
$installCheckFlags ${installCheckFlagsArray[@]}"
+    make ${makefile:+-f $makefile} \
+        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
+        $makeFlags "${makeFlagsArray[@]}" \
+        $installCheckFlags "${installCheckFlagsArray[@]}" 
${installCheckTarget:-installcheck}
+
+    runHook postInstallCheck
+}
+
+
 distPhase() {
     runHook preDist
 
@@ -795,6 +808,7 @@
         checkPhase) header "running tests";;
         installPhase) header "installing";;
         fixupPhase) header "post-installation fixup";;
+        installCheckPhase) header "running install tests";;
         *) header "$phase";;
     esac
 }
@@ -811,7 +825,7 @@
     if [ -z "$phases" ]; then
         phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
             configurePhase $preBuildPhases buildPhase checkPhase \
-            $preInstallPhases installPhase fixupPhase \
+            $preInstallPhases installPhase fixupPhase installCheckPhase \
             $preDistPhases distPhase $postPhases";
     fi
 
@@ -820,6 +834,7 @@
         if [ "$curPhase" = checkPhase -a -z "$doCheck" ]; then continue; fi
         if [ "$curPhase" = installPhase -a -n "$dontInstall" ]; then continue; 
fi
         if [ "$curPhase" = fixupPhase -a -n "$dontFixup" ]; then continue; fi
+        if [ "$curPhase" = installCheckPhase -a -z "$doInstallCheck" ]; then 
continue; fi
         if [ "$curPhase" = distPhase -a -z "$doDist" ]; then continue; fi
 
         if [ -n "$tracePhases" ]; then

Modified: 
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/unstable.nix
==============================================================================
--- 
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/unstable.nix  
    Tue May  1 20:31:01 2012        (r33966)
+++ 
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/nix/unstable.nix  
    Tue May  1 21:00:30 2012        (r33967)
@@ -34,6 +34,8 @@
       CFLAGS=-O3 CXXFLAGS=-O3
     '';
 
+  doInstallCheck = true;
+
   crossAttrs = {
     postUnpack =
       '' export CPATH="${bzip2.hostDrv}/include"
@@ -51,14 +53,11 @@
       '' + stdenv.lib.optionalString (
           stdenv.cross ? nix && stdenv.cross.nix ? system
       ) ''--with-system=${stdenv.cross.nix.system}'';
-    doCheck = false;
-    postInstall = ":";
+    doInstallCheck = false;
   };
 
   enableParallelBuilding = true;
 
-  postInstall = "make installcheck";
-
   meta = {
     description = "The Nix Deployment System";
     homepage = http://nixos.org/;
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits