diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-08-31 14:43:38 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-08-31 14:44:34 +0200 |
| commit | 44d43c7a854effb2bc42eb9c0aea3594415fad6a (patch) | |
| tree | 30402b9fd63d4d6e6293d4e3e13d678c159da5fe | |
| parent | 79601521fceb6b2f76d87cf3df45a76e43b1ffcf (diff) | |
daemon: Really enable automatic deduplication by default.
* nix/nix-daemon/guix-daemon.cc (main): Set 'autoStoreOptimise' to
true. Add 'printMsg' call.
* tests/derivations.scm ("identical files are deduplicated"): New test.
| -rw-r--r-- | nix/nix-daemon/guix-daemon.cc | 7 | ||||
| -rw-r--r-- | tests/derivations.scm | 22 |
2 files changed, 29 insertions, 0 deletions
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc index 0bb9f7559c..0309743de1 100644 --- a/nix/nix-daemon/guix-daemon.cc +++ b/nix/nix-daemon/guix-daemon.cc @@ -249,6 +249,9 @@ main (int argc, char *argv[]) settings.useChroot = false; #endif + /* Turn automatic deduplication on by default. */ + settings.autoOptimiseStore = true; + argvSaved = argv; try @@ -326,6 +329,10 @@ main (int argc, char *argv[]) #endif printMsg (lvlDebug, + format ("automatic deduplication set to %1%") + % settings.autoOptimiseStore); + + printMsg (lvlDebug, format ("listening on `%1%'") % settings.nixDaemonSocketFile); run (nothing); diff --git a/tests/derivations.scm b/tests/derivations.scm index 19bcebcb21..855b059d16 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -151,6 +151,28 @@ ;; the contents. (valid-path? %store (derivation->output-path drv))))) +(test-assert "identical files are deduplicated" + (let* ((build1 (add-text-to-store %store "one.sh" + "echo hello, world > \"$out\"\n" + '())) + (build2 (add-text-to-store %store "two.sh" + "# Hey!\necho hello, world > \"$out\"\n" + '())) + (drv1 (derivation %store "foo" + %bash `(,build1) + #:inputs `((,%bash) (,build1)))) + (drv2 (derivation %store "bar" + %bash `(,build2) + #:inputs `((,%bash) (,build2))))) + (and (build-derivations %store (list drv1 drv2)) + (let ((file1 (derivation->output-path drv1)) + (file2 (derivation->output-path drv2))) + (and (valid-path? %store file1) (valid-path? %store file2) + (string=? (call-with-input-file file1 get-string-all) + "hello, world\n") + (= (stat:ino (lstat file1)) + (stat:ino (lstat file2)))))))) + (test-assert "fixed-output-derivation?" (let* ((builder (add-text-to-store %store "my-fixed-builder.sh" "echo -n hello > $out" '())) |