From f3eb29c6530e990b18e9f04390f6fa7bfbc58078 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 30 Jul 2012 17:09:13 -0400 Subject: [PATCH] Fix the test --- tests/binary-cache.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/binary-cache.sh b/tests/binary-cache.sh index 8c1138210..0704a2bb3 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