diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/binary-cache.sh | 16 | ||||
| -rw-r--r-- | tests/local.mk | 2 | ||||
| -rw-r--r-- | tests/pass-as-file.sh | 17 | ||||
| -rw-r--r-- | tests/remote-builds.nix | 1 |
4 files changed, 26 insertions, 10 deletions
diff --git a/tests/binary-cache.sh b/tests/binary-cache.sh index 753c2c466e6d..c72d2defa5d0 100644 --- a/tests/binary-cache.sh +++ b/tests/binary-cache.sh @@ -94,18 +94,16 @@ if [ -n "$HAVE_SODIUM" ]; then # Create a signed binary cache. clearCache -declare -a res=($(nix-store --generate-binary-cache-key test.nixos.org-1)) -publicKey="${res[0]}" -secretKey="${res[1]}" -echo "$secretKey" > $TEST_ROOT/secret-key +declare -a res=($(nix-store --generate-binary-cache-key test.nixos.org-1 $TEST_ROOT/sk1 $TEST_ROOT/pk1 )) +publicKey="$(cat $TEST_ROOT/pk1)" -res=($(nix-store --generate-binary-cache-key test.nixos.org-1)) -badKey="${res[0]}" +res=($(nix-store --generate-binary-cache-key test.nixos.org-1 $TEST_ROOT/sk2 $TEST_ROOT/pk2)) +badKey="$(cat $TEST_ROOT/pk2)" -res=($(nix-store --generate-binary-cache-key foo.nixos.org-1)) -otherKey="${res[0]}" +res=($(nix-store --generate-binary-cache-key foo.nixos.org-1 $TEST_ROOT/sk3 $TEST_ROOT/pk3)) +otherKey="$(cat $TEST_ROOT/pk3)" -nix-push --dest $cacheDir --key-file $TEST_ROOT/secret-key $outPath +nix-push --dest $cacheDir --key-file $TEST_ROOT/sk1 $outPath # Downloading should fail if we don't provide a key. diff --git a/tests/local.mk b/tests/local.mk index 69a227495d94..7a24fadcb8b9 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -11,7 +11,7 @@ nix_tests = \ binary-patching.sh timeout.sh secure-drv-outputs.sh nix-channel.sh \ multiple-outputs.sh import-derivation.sh fetchurl.sh optimise-store.sh \ binary-cache.sh nix-profile.sh repair.sh dump-db.sh case-hack.sh \ - check-reqs.sh + check-reqs.sh pass-as-file.sh # parallel.sh install-tests += $(foreach x, $(nix_tests), tests/$(x)) diff --git a/tests/pass-as-file.sh b/tests/pass-as-file.sh new file mode 100644 index 000000000000..3dfe10baa235 --- /dev/null +++ b/tests/pass-as-file.sh @@ -0,0 +1,17 @@ +source common.sh + +clearStore + +outPath=$(nix-build --no-out-link -E " +with import ./config.nix; + +mkDerivation { + name = \"pass-as-file\"; + passAsFile = [ \"foo\" ]; + foo = [ \"xyzzy\" ]; + builder = builtins.toFile \"builder.sh\" '' + [ \"\$(cat \$fooPath)\" = xyzzy ] + touch \$out + ''; +} +") diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix index 0f16026a428a..34276e7d6981 100644 --- a/tests/remote-builds.nix +++ b/tests/remote-builds.nix @@ -14,6 +14,7 @@ let { services.openssh.enable = true; virtualisation.writableStore = true; nix.package = nix; + nix.useChroot = true; }; # Trivial Nix expression to build remotely. |