diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2017-10-03T09·06+0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03T09·06+0200 |
| commit | fce24b7d6caec14645cafebf4cecb5b150761796 (patch) | |
| tree | a4a6b1164cbc8529017667225c46a11958d81cbc | |
| parent | f3e0d468218994343d0e595a50304cc122ad1406 (diff) | |
| parent | 3139cad9cd3aab9e1fe06b6fb5e9e11b3524aca2 (diff) | |
Merge pull request #1587 from copumpkin/fix-tests
Fix tests
| -rw-r--r-- | tests/binary-cache.sh | 4 | ||||
| -rw-r--r-- | tests/nix-channel.sh | 2 | ||||
| -rw-r--r-- | tests/repair.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/binary-cache.sh b/tests/binary-cache.sh index 532099d021..30d7cc6ba8 100644 --- a/tests/binary-cache.sh +++ b/tests/binary-cache.sh @@ -6,7 +6,7 @@ clearCache # Create the binary cache. outPath=$(nix-build dependencies.nix --no-out-link) -nix copy --recursive --to file://$cacheDir $outPath +nix copy --to file://$cacheDir $outPath basicTests() { @@ -117,7 +117,7 @@ badKey="$(cat $TEST_ROOT/pk2)" res=($(nix-store --generate-binary-cache-key foo.nixos.org-1 $TEST_ROOT/sk3 $TEST_ROOT/pk3)) otherKey="$(cat $TEST_ROOT/pk3)" -nix copy --recursive --to file://$cacheDir?secret-key=$TEST_ROOT/sk1 $outPath +nix copy --to file://$cacheDir?secret-key=$TEST_ROOT/sk1 $outPath # Downloading should fail if we don't provide a key. diff --git a/tests/nix-channel.sh b/tests/nix-channel.sh index 553ada51d9..55f1695c44 100644 --- a/tests/nix-channel.sh +++ b/tests/nix-channel.sh @@ -15,7 +15,7 @@ nix-channel --remove xyzzy # Create a channel. rm -rf $TEST_ROOT/foo mkdir -p $TEST_ROOT/foo -nix copy --recursive --to file://$TEST_ROOT/foo?compression="bzip2" $(nix-store -r $(nix-instantiate dependencies.nix)) +nix copy --to file://$TEST_ROOT/foo?compression="bzip2" $(nix-store -r $(nix-instantiate dependencies.nix)) rm -rf $TEST_ROOT/nixexprs mkdir -p $TEST_ROOT/nixexprs cp config.nix dependencies.nix dependencies.builder*.sh $TEST_ROOT/nixexprs/ diff --git a/tests/repair.sh b/tests/repair.sh index 57152d450a..7c928e3be7 100644 --- a/tests/repair.sh +++ b/tests/repair.sh @@ -46,7 +46,7 @@ fi # --verify can fix it. clearCache -nix copy --recursive --to file://$cacheDir $path +nix copy --to file://$cacheDir $path chmod u+w $path2 rm -rf $path2 |