Author: eelco
Date: Thu Jan 26 13:04:50 2012
New Revision: 31849
URL: https://nixos.org/websvn/nix/?rev=31849&sc=1
Log:
* Add a test for importing derivations.
Added:
nix/trunk/tests/import-derivation.nix
nix/trunk/tests/import-derivation.sh
Modified:
nix/trunk/tests/Makefile.am
Modified: nix/trunk/tests/Makefile.am
==============================================================================
--- nix/trunk/tests/Makefile.am Thu Jan 26 10:11:47 2012 (r31848)
+++ nix/trunk/tests/Makefile.am Thu Jan 26 13:04:50 2012 (r31849)
@@ -9,7 +9,7 @@
gc-runtime.sh install-package.sh check-refs.sh filter-source.sh \
remote-store.sh export.sh export-graph.sh negative-caching.sh \
binary-patching.sh timeout.sh secure-drv-outputs.sh nix-channel.sh \
- multiple-outputs.sh
+ multiple-outputs.sh import-derivation.sh
XFAIL_TESTS =
@@ -37,5 +37,6 @@
timeout.nix timeout.builder.sh \
secure-drv-outputs.nix \
multiple-outputs.nix \
+ import-derivation.nix \
$(wildcard lang/*.nix) $(wildcard lang/*.exp) $(wildcard lang/*.exp.xml)
$(wildcard lang/*.flags) $(wildcard lang/dir*/*.nix) \
common.sh.in
Added: nix/trunk/tests/import-derivation.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nix/trunk/tests/import-derivation.nix Thu Jan 26 13:04:50 2012
(r31849)
@@ -0,0 +1,23 @@
+with import ./config.nix;
+
+let
+
+ bar = mkDerivation {
+ name = "bar";
+ builder = builtins.toFile "builder.sh"
+ ''
+ echo 'builtins.add 123 456' > $out
+ '';
+ };
+
+ value = import bar;
+
+in
+
+mkDerivation {
+ name = "foo";
+ builder = builtins.toFile "builder.sh"
+ ''
+ echo -n FOO${toString value} > $out
+ '';
+}
Added: nix/trunk/tests/import-derivation.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nix/trunk/tests/import-derivation.sh Thu Jan 26 13:04:50 2012
(r31849)
@@ -0,0 +1,12 @@
+source common.sh
+
+clearStore
+
+if nix-instantiate --readonly-mode ./import-derivation.nix; then
+ echo "read-only evaluation of an imported derivation unexpectedly failed"
+ exit 1
+fi
+
+outPath=$(nix-build ./import-derivation.nix)
+
+[ "$(cat $outPath)" = FOO579 ]
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
