diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-30T21·09-0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-30T21·09-0400 |
commit | f3eb29c6530e990b18e9f04390f6fa7bfbc58078 (patch) | |
tree | e333405b88ae252600efd73a525803fe0ec4848e | |
parent | 9de6d10d112665ba1c6d807dd3950ed4c43a4404 (diff) |
Fix the test
-rw-r--r-- | tests/binary-cache.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/binary-cache.sh b/tests/binary-cache.sh index 8c1138210412..0704a2bb3b8f 100644 --- a/tests/binary-cache.sh +++ b/tests/binary-cache.sh @@ -16,9 +16,9 @@ nix-push --dest $cacheDir $outPath clearStore rm -f $NIX_STATE_DIR/binary-cache* -NIX_BINARY_CACHES="file://$cacheDir" nix-env -f dependencies.nix -qas \* | grep -- "---" +nix-env --option binary-caches "file://$cacheDir" -f dependencies.nix -qas \* | grep -- "---" -NIX_BINARY_CACHES="file://$cacheDir" nix-store -r $outPath +nix-store --option binary-caches "file://$cacheDir" -r $outPath # But with the right configuration, "nix-env -qas" should also work. @@ -26,9 +26,9 @@ clearStore rm -f $NIX_STATE_DIR/binary-cache* echo "WantMassQuery: 1" >> $cacheDir/nix-cache-info -NIX_BINARY_CACHES="file://$cacheDir" nix-env -f dependencies.nix -qas \* | grep -- "--S" +nix-env --option binary-caches "file://$cacheDir" -f dependencies.nix -qas \* | grep -- "--S" -NIX_BINARY_CACHES="file://$cacheDir" nix-store -r $outPath +nix-store --option binary-caches "file://$cacheDir" -r $outPath nix-store --check-validity $outPath nix-store -qR $outPath | grep input-2 |