* Fix the `--fallback' switch.

* Fix the substitutes tests.

1 files changed, 3 insertions, 13 deletions

diff --git a/tests/substitutes.sh b/tests/substitutes.sh
index 72703af4a2..c0b61288a4 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