From 84c4631221bc65643830173b4affe58b0dc58202 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed, 1 Mar 2006 12:51:18 +0000
Subject: * Simplification.

---
 tests/dependencies.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests/dependencies.sh')

diff --git a/tests/dependencies.sh b/tests/dependencies.sh
index 0d19cd2bb0be..cc912f8ef6ca 100644
--- a/tests/dependencies.sh
+++ b/tests/dependencies.sh
@@ -1,35 +1,35 @@
 source common.sh
 
-drvPath=$($TOP/src/nix-instantiate/nix-instantiate dependencies.nix)
+drvPath=$($nixinstantiate dependencies.nix)
 
 echo "derivation is $drvPath"
 
 $TOP/src/nix-store/nix-store -q --tree "$drvPath" | grep '   +---.*builder1.sh'
 
 # Test Graphviz graph generation.
-$TOP/src/nix-store/nix-store -q --graph "$drvPath" > $TEST_ROOT/graph
+$nixstore -q --graph "$drvPath" > $TEST_ROOT/graph
 if test -n "$dot"; then
     # Does it parse?
     $dot < $TEST_ROOT/graph
 fi    
 
-outPath=$($TOP/src/nix-store/nix-store -rvv "$drvPath")
+outPath=$($nixstore -rvv "$drvPath")
 
 # Test Graphviz graph generation.
-$TOP/src/nix-store/nix-store -q --graph "$outPath" > $TEST_ROOT/graph
+$nixstore -q --graph "$outPath" > $TEST_ROOT/graph
 if test -n "$dot"; then
     # Does it parse?
     $dot < $TEST_ROOT/graph
 fi    
 
-$TOP/src/nix-store/nix-store -q --tree "$outPath" | grep '+---.*dependencies-input-2'
+$nixstore -q --tree "$outPath" | grep '+---.*dependencies-input-2'
 
 echo "output path is $outPath"
 
 text=$(cat "$outPath"/foobar)
 if test "$text" != "FOOBAR"; then exit 1; fi
 
-deps=$($TOP/src/nix-store/nix-store -quR "$drvPath")
+deps=$($nixstore -quR "$drvPath")
 
 echo "output closure contains $deps"
 
@@ -43,8 +43,8 @@ if echo "$deps" | grep -q "dependencies-input-1"; then exit 1; fi
 input2OutPath=$(echo "$deps" | grep "dependencies-input-2")
 
 # The referrers closure of input-2 should include outPath.
-$TOP/src/nix-store/nix-store -q --referrers-closure "$input2OutPath" | grep "$outPath"
+$nixstore -q --referrers-closure "$input2OutPath" | grep "$outPath"
 
 # Check that the derivers are set properly.
-test $($TOP/src/nix-store/nix-store -q --deriver "$outPath") = "$drvPath"
-$TOP/src/nix-store/nix-store -q --deriver "$input2OutPath" | grep -q -- "-input-2.drv" 
+test $($nixstore -q --deriver "$outPath") = "$drvPath"
+$nixstore -q --deriver "$input2OutPath" | grep -q -- "-input-2.drv" 
-- 
cgit 1.4.1