From 98df735b5149bc1e39ce6b0bae13fbf7cebcdc05 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 9 Feb 2005 12:57:13 +0000 Subject: * Propagate the deriver of a path through the substitute mechanism. * Removed some dead code (successor stuff) from nix-push. * Updated terminology in the tests (store expr -> drv path). * Check that the deriver is set properly in the tests. --- tests/fallback.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/fallback.sh') diff --git a/tests/fallback.sh b/tests/fallback.sh index ac4370c61b..24e5784100 100644 --- a/tests/fallback.sh +++ b/tests/fallback.sh @@ -1,14 +1,14 @@ -storeExpr=$($TOP/src/nix-instantiate/nix-instantiate fallback.nix) -echo "store expr is $storeExpr" +drvPath=$($TOP/src/nix-instantiate/nix-instantiate fallback.nix) +echo "derivation is $drvPath" -outPath=$($TOP/src/nix-store/nix-store -q --fallback "$storeExpr") +outPath=$($TOP/src/nix-store/nix-store -q --fallback "$drvPath") echo "output path is $outPath" # Register a non-existant substitute -(echo $outPath && echo $TOP/no-such-program && echo 0 && echo 0) | $TOP/src/nix-store/nix-store --substitute +(echo $outPath && echo "" && echo $TOP/no-such-program && echo 0 && echo 0) | $TOP/src/nix-store/nix-store --substitute # Build the derivation -$TOP/src/nix-store/nix-store -r --fallback "$storeExpr" +$TOP/src/nix-store/nix-store -r --fallback "$drvPath" text=$(cat "$outPath"/hello) if test "$text" != "Hello World!"; then exit 1; fi -- cgit 1.4.1