From de8d0c3e147f1c0a1a9ea708a77b9371ba2ec004 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 4 Jun 2010 13:18:19 +0000
Subject: [PATCH] added some debugging

svn path=/nixos/trunk/; revision=22142
---
 lib/testing.nix | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 3486dd6fc9e..8b2af1f7ebf 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -118,18 +118,44 @@ rec {
       # now only works for derivations that lead to a directory in the store, not a file. 
       buildrunner = writeText "vm-build" ''
         source $1
-        oldout=$out
+        origout=$out
         out=$TMPDIR$out
+
+        echo "--------------------------------"
+        echo "Creating $out"
+        echo "--------------------------------"
         ${coreutils}/bin/mkdir -p $out
-        ${coreutils}/bin/mkdir -p $oldout
-        ${coreutils}/bin/ln -s $out $oldout
 
+        echo "--------------------------------"
+        echo "Linking $origout to $out "
+        echo "--------------------------------"
+        ${coreutils}/bin/ln -s $out $origout
+
+        echo "--------------------------------"
+        echo "Creating $TMPDIR"
+        echo "--------------------------------"
         ${coreutils}/bin/mkdir -p $TMPDIR
-        exec $origBuilder $origArgs 
 
-        ${coreutils}/bin/rm -v $oldout
-        ${coreutils}/bin/cp -Rv $out/* $oldout/
-        out=$oldout 
+        echo "--------------------------------"
+        echo "Running builder"
+        echo "--------------------------------"
+        $origBuilder $origArgs 
+
+        echo "--------------------------------"
+        echo "Removing link $origout"
+        echo "--------------------------------"
+        ${coreutils}/bin/rm -vf $origout
+
+        echo "--------------------------------"
+        echo "Creating $origout"
+        echo "--------------------------------"
+        ${coreutils}/bin/mkdir -p $origout
+
+        echo "--------------------------------"
+        echo "Copying $out/* to $origout/"
+        echo "--------------------------------"
+        ${coreutils}/bin/cp -Rv $out/* $origout/
+        out=$origout 
       '';
 
       testscript = ''