From c6290e42bc8890e2036013773a98e3551352c91a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 25 Jan 2005 13:00:12 +0000 Subject: * Fix the `--fallback' switch. * Fix the substitutes tests. --- tests/substitutes.sh | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'tests/substitutes.sh') diff --git a/tests/substitutes.sh b/tests/substitutes.sh index 72703af4a22f..c0b61288a40b 100644 --- a/tests/substitutes.sh +++ b/tests/substitutes.sh @@ -3,28 +3,18 @@ storeExpr=$($TOP/src/nix-instantiate/nix-instantiate substitutes.nix) echo "store expr is $storeExpr" # Find the output path. -outPath=$($TOP/src/nix-store/nix-store -qvvvvv "$storeExpr") +outPath=$($TOP/src/nix-store/nix-store -qvv "$storeExpr") echo "output path is $outPath" -# Build the substitute program. -subProgram=$($TOP/src/nix-store/nix-store -qnf \ - $($TOP/src/nix-instantiate/nix-instantiate substituter.nix))/substituter -echo "substitute program is $subProgram" - regSub() { (echo $1 && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld) | $TOP/src/nix-store/nix-store --substitute } -# Register a fake successor, and a substitute for it. -suc=$NIX_STORE_DIR/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-s.store -regSub $suc $subProgram -$TOP/src/nix-store/nix-store --successor $storeExpr $suc - # Register a substitute for the output path. -regSub $outPath $subProgram +regSub $outPath $(pwd)/substituter.sh -$TOP/src/nix-store/nix-store -rvvvvv "$storeExpr" +$TOP/src/nix-store/nix-store -rvv "$storeExpr" text=$(cat "$outPath"/hello) if test "$text" != "Hallo Wereld"; then exit 1; fi -- cgit 1.4.1