about summary refs log tree commit diff
path: root/tests/substitutes.sh
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2004-12-20T14·38+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-12-20T14·38+0000
commit96c3d8a61550545549dfa31c62e68d16f4e89c0c (patch)
tree38c2a90caa0b86ac0ab069c3fa20f0884197717d /tests/substitutes.sh
parent8b9697e57596aaf142799ae6bec8bb53155dba78 (diff)
* I love test sets.
Diffstat (limited to 'tests/substitutes.sh')
-rw-r--r--tests/substitutes.sh13
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/substitutes.sh b/tests/substitutes.sh
index 7b236249b190..72703af4a22f 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"