diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-01-25 10:55:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-01-25 10:55:33 +0000 |
| commit | 80faa2f98af8616ab89ac2af63431b887a84fb32 (patch) | |
| tree | eb24971c4f7dfe23b1927c055a68f7d4cec47ba2 /tests | |
| parent | 6a0a2d559336b3a7a165fb0f87f5e70caa9d8d72 (diff) | |
* In nix-store: change `--build' back to `--realise'. Also brought
back the query flag `--force-realise'.
* Fixed some of the tests.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dependencies.sh | 6 | ||||
| -rw-r--r-- | tests/locking.sh | 4 | ||||
| -rw-r--r-- | tests/parallel.sh | 2 | ||||
| -rw-r--r-- | tests/simple.sh | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/dependencies.sh b/tests/dependencies.sh index a9b9cd083..fe4aa0c3c 100644 --- a/tests/dependencies.sh +++ b/tests/dependencies.sh @@ -2,16 +2,16 @@ storeExpr=$($TOP/src/nix-instantiate/nix-instantiate dependencies.nix) echo "store expr is $storeExpr" -outPath=$($TOP/src/nix-store/nix-store -bvv "$storeExpr") +outPath=$($TOP/src/nix-store/nix-store -rvv "$storeExpr") echo "output path is $outPath" text=$(cat "$outPath"/foobar) if test "$text" != "FOOBAR"; then exit 1; fi -deps=$($TOP/src/nix-store/nix-store -qnR "$storeExpr") +deps=$($TOP/src/nix-store/nix-store -quR "$storeExpr") -echo "output closures are $deps" +echo "output closure contains $deps" # The output path should be in the closure. echo "$deps" | grep -q "$outPath" diff --git a/tests/locking.sh b/tests/locking.sh index f89e1240b..5cafa2910 100644 --- a/tests/locking.sh +++ b/tests/locking.sh @@ -4,12 +4,12 @@ echo "store expr is $storeExpr" for i in 1 2 3 4 5; do echo "WORKER $i" - $TOP/src/nix-store/nix-store -rvvvvvB "$storeExpr" & + $TOP/src/nix-store/nix-store -rvv "$storeExpr" & done sleep 5 -outPath=$($TOP/src/nix-store/nix-store -qnfvvvvv "$storeExpr") +outPath=$($TOP/src/nix-store/nix-store -qvvf "$storeExpr") echo "output path is $outPath" diff --git a/tests/parallel.sh b/tests/parallel.sh index d16da3a7a..0044aaea6 100644 --- a/tests/parallel.sh +++ b/tests/parallel.sh @@ -2,7 +2,7 @@ storeExpr=$($TOP/src/nix-instantiate/nix-instantiate parallel.nix) echo "store expr is $storeExpr" -outPath=$($TOP/src/nix-store/nix-store -qnfvvvv -j10000 "$storeExpr") +outPath=$($TOP/src/nix-store/nix-store -qfvv -j10000 "$storeExpr") echo "output path is $outPath" diff --git a/tests/simple.sh b/tests/simple.sh index 4da1a7b53..a5435a53b 100644 --- a/tests/simple.sh +++ b/tests/simple.sh @@ -2,7 +2,7 @@ storeExpr=$($TOP/src/nix-instantiate/nix-instantiate simple.nix) echo "store expr is $storeExpr" -outPath=$($TOP/src/nix-store/nix-store -bvv "$storeExpr") +outPath=$($TOP/src/nix-store/nix-store -rvv "$storeExpr") echo "output path is $outPath" |