* I love test sets.

3 files changed, 21 insertions, 18 deletions

diff --git a/tests/fallback.sh b/tests/fallback.sh
index 5454e1ef4..b859d74ee 100644
--- a/tests/fallback.sh
+++ b/tests/fallback.sh
@@ -4,7 +4,7 @@ echo "store expr is $storeExpr"
 
 # Register a non-existant successor (and a nox-existant substitute).
 suc=$NIX_STORE_DIR/deadbeafdeadbeafdeadbeafdeadbeaf-s.store
-(echo $suc && echo $NIX_STORE_DIR/ffffffffffffffffffffffffffffffff.store && echo "/bla" && echo 0) | $TOP/src/nix-store/nix-store --substitute
+(echo $suc && echo $TOP/no-such-program && echo 0) | $TOP/src/nix-store/nix-store --substitute
 $TOP/src/nix-store/nix-store --successor $storeExpr $suc
 
 outPath=$($TOP/src/nix-store/nix-store -qnf --fallback "$storeExpr")
diff --git a/tests/substitutes.sh b/tests/substitutes.sh
index 7b236249b..72703af4a 100644
--- a/tests/substitutes.sh
+++ b/tests/substitutes.sh
@@ -6,21 +6,22 @@ echo "store expr is $storeExpr"
 outPath=$($TOP/src/nix-store/nix-store -qvvvvv "$storeExpr")
 echo "output path is $outPath"
 
-# Instantiate the substitute program.
-subExpr=$($TOP/src/nix-instantiate/nix-instantiate substituter.nix)
-echo "store expr is $subExpr"
+# 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 "/substituter" && echo 3 && echo $outPath && echo Hallo && echo Wereld) | $TOP/src/nix-store/nix-store --substitute
+    (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 $subExpr
+regSub $suc $subProgram
 $TOP/src/nix-store/nix-store --successor $storeExpr $suc
 
 # Register a substitute for the output path.
-regSub $outPath $subExpr
+regSub $outPath $subProgram
 
 
 $TOP/src/nix-store/nix-store -rvvvvv "$storeExpr"
diff --git a/tests/substitutes2.sh b/tests/substitutes2.sh
index 76ff74b3e..b38f4c43f 100644
--- a/tests/substitutes2.sh
+++ b/tests/substitutes2.sh
@@ -6,32 +6,34 @@ echo "store expr is $storeExpr"
 outPath=$($TOP/src/nix-store/nix-store -qvvvvv "$storeExpr")
 echo "output path is $outPath"
 
-# Instantiate the substitute program.
-subExpr=$($TOP/src/nix-instantiate/nix-instantiate substituter.nix)
-echo "store expr is $subExpr"
+# 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"
 
-# Instantiate the failing substitute program.
-subExpr2=$($TOP/src/nix-instantiate/nix-instantiate substituter2.nix)
-echo "store expr is $subExpr2"
+# Build the failing substitute program.
+subProgram2=$($TOP/src/nix-store/nix-store -qnf \
+    $($TOP/src/nix-instantiate/nix-instantiate substituter2.nix))/substituter
+echo "failing substitute program is $subProgram2"
 
 regSub() {
-    (echo $1 && echo $2 && echo "/substituter" && echo 3 && echo $outPath && echo Hallo && echo Wereld) | $TOP/src/nix-store/nix-store --substitute
+    (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/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab-s.store
-regSub $suc $subExpr
+regSub $suc $subProgram
 $TOP/src/nix-store/nix-store --successor $storeExpr $suc
 
 # Register a failing substitute for it (it takes precedence).
-regSub $suc $subExpr2
+regSub $suc $subProgram2
 
 # Register a substitute for the output path.
-regSub $outPath $subExpr
+regSub $outPath $subProgram
 
 # Register another substitute for the output path.  This one will
 # produce other output. 
-regSub $outPath $subExpr2
+regSub $outPath $subProgram2
 
 
 $TOP/src/nix-store/nix-store -rvvvvv "$storeExpr"