about summary refs log tree commit diff
path: root/tests/binary-cache.sh
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-11-20T16·29+0100
committerEelco Dolstra <edolstra@gmail.com>2017-11-20T16·32+0100
commit7a2b64e55c7d57707f4d1ed54ee21bf69d0d0d16 (patch)
tree26b4270cdbbd180c0253e50310211ac29a4b1637 /tests/binary-cache.sh
parentea94a87493df0a60cadba291e31bbe7c6847c0c5 (diff)
binary-cache-public-keys -> trusted-public-keys
The name had become a misnomer since it's not only for substitution
from binary caches, but when adding/copying any
(non-content-addressed) path to a store.
Diffstat (limited to 'tests/binary-cache.sh')
-rw-r--r--tests/binary-cache.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/binary-cache.sh b/tests/binary-cache.sh
index 2a044d2edc56..f7c0b2f78916 100644
--- a/tests/binary-cache.sh
+++ b/tests/binary-cache.sh
@@ -131,11 +131,11 @@ clearCacheCache
 clearStore
 clearCacheCache
 
-(! nix-store -r $outPath --option binary-caches "file://$cacheDir" --option signed-binary-caches '*' --option binary-cache-public-keys "$badKey")
+(! nix-store -r $outPath --option binary-caches "file://$cacheDir" --option signed-binary-caches '*' --option trusted-public-keys "$badKey")
 
 
 # It should succeed if we provide the correct key.
-nix-store -r $outPath --option binary-caches "file://$cacheDir" --option signed-binary-caches '*' --option binary-cache-public-keys "$otherKey $publicKey"
+nix-store -r $outPath --option binary-caches "file://$cacheDir" --option signed-binary-caches '*' --option trusted-public-keys "$otherKey $publicKey"
 
 
 # It should fail if we corrupt the .narinfo.
@@ -152,10 +152,10 @@ done
 
 clearCacheCache
 
-(! nix-store -r $outPath --option binary-caches "file://$cacheDir2" --option signed-binary-caches '*' --option binary-cache-public-keys "$publicKey")
+(! nix-store -r $outPath --option binary-caches "file://$cacheDir2" --option signed-binary-caches '*' --option trusted-public-keys "$publicKey")
 
 # If we provide a bad and a good binary cache, it should succeed.
 
-nix-store -r $outPath --option binary-caches "file://$cacheDir2 file://$cacheDir" --option signed-binary-caches '*' --option binary-cache-public-keys "$publicKey"
+nix-store -r $outPath --option binary-caches "file://$cacheDir2 file://$cacheDir" --option signed-binary-caches '*' --option trusted-public-keys "$publicKey"
 
 fi # HAVE_LIBSODIUM