summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-05-04 16:41:40 +0200
committerLudovic Courtès <ludo@gnu.org>2023-05-04 17:06:43 +0200
commit68fa28b3c3f6cca4485575b6dfa418be656443e7 (patch)
tree9e37fb3ff83636bee5da3e86d8d8dd51b21c2c13 /tests
parentf0a51a2bda26f9cc1e0b54b48712bd7cc54408e9 (diff)
style: Make 'safe' policy less conservative.
Previously, a mere (arguments '(#:tests? #f)) would lead guix style -S inputs --input-simplification=safe to bail out. It now recognizes such trivial argument lists and proceeds. * guix/scripts/style.scm (trivial-package-arguments?): New procedure. (simplify-package-inputs): Use it in the 'safe case instead of 'null?'. * tests/style.scm ("input labels, 'safe' policy, trivial arguments"): New test.
Diffstat (limited to 'tests')
-rw-r--r--tests/style.scm22
1 files changed, 21 insertions, 1 deletions
diff --git a/tests/style.scm b/tests/style.scm
index 6aab2c3785..f141a57d7f 100644
--- a/tests/style.scm
+++ b/tests/style.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2021-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021-2023 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -234,6 +234,26 @@
(list (package-inputs (@ (my-packages) my-coreutils))
(read-package-field (@ (my-packages) my-coreutils) 'inputs)))))
+(test-equal "input labels, 'safe' policy, trivial arguments"
+ (list `(("gmp" ,gmp) ("mpfr" ,mpfr))
+ "\
+ (inputs (list gmp mpfr))\n")
+ (call-with-test-package '((inputs `(("GMP" ,gmp) ("Mpfr" ,mpfr)))
+ (arguments ;"trivial" arguments
+ '(#:tests? #f
+ #:test-target "whatever")))
+ (lambda (directory)
+ (define file
+ (string-append directory "/my-packages.scm"))
+
+ (system* "guix" "style" "-L" directory "my-coreutils"
+ "-S" "inputs"
+ "--input-simplification=safe")
+
+ (load file)
+ (list (package-inputs (@ (my-packages) my-coreutils))
+ (read-package-field (@ (my-packages) my-coreutils) 'inputs)))))
+
(test-equal "input labels, 'safe' policy, nothing changed"
(list `(("GMP" ,gmp) ("ACL" ,acl))
"\