Author: eelco
Date: Wed Dec 21 14:42:06 2011
New Revision: 31015
URL: https://nixos.org/websvn/nix/?rev=31015&sc=1
Log:
* Add a test for unsafeDiscardOutputDependency. Not really related to
multiple outputs, but good to have anyway.
Modified:
nix/branches/multiple-outputs-sandbox/tests/multiple-outputs.nix
nix/branches/multiple-outputs-sandbox/tests/multiple-outputs.sh
Modified: nix/branches/multiple-outputs-sandbox/tests/multiple-outputs.nix
==============================================================================
--- nix/branches/multiple-outputs-sandbox/tests/multiple-outputs.nix Wed Dec
21 13:47:21 2011 (r31014)
+++ nix/branches/multiple-outputs-sandbox/tests/multiple-outputs.nix Wed Dec
21 14:42:06 2011 (r31015)
@@ -42,6 +42,16 @@
'';
};
+ d = mkDerivation {
+ name = "multiple-outputs-d";
+ drv = builtins.unsafeDiscardOutputDependency b.drvPath;
+ builder = builtins.toFile "builder.sh"
+ ''
+ mkdir $out
+ echo $drv > $out/drv
+ '';
+ };
+
cyclic = (mkDerivation {
name = "cyclic-outputs";
outputs = [ "a" "b" ];
Modified: nix/branches/multiple-outputs-sandbox/tests/multiple-outputs.sh
==============================================================================
--- nix/branches/multiple-outputs-sandbox/tests/multiple-outputs.sh Wed Dec
21 13:47:21 2011 (r31014)
+++ nix/branches/multiple-outputs-sandbox/tests/multiple-outputs.sh Wed Dec
21 14:42:06 2011 (r31015)
@@ -14,6 +14,12 @@
grep -q 'multiple-outputs-a.drv",\["first","second"\]' $drvPath
grep -q 'multiple-outputs-b.drv",\["out"\]' $drvPath
+# While we're at it, test the ‘unsafeDiscardOutputDependency’ primop.
+outPath=$(nix-build multiple-outputs.nix -A d)
+drvPath=$(cat $outPath/drv)
+outPath=$(nix-store -q $drvPath)
+! [ -e "$outPath" ]
+
# Do a build of something that depends on a derivation with multiple
# outputs.
echo "building b..."
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
