diff options
| -rw-r--r-- | doc/guix.texi | 5 | ||||
| -rw-r--r-- | gnu/packages/fontutils.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/pdf.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/python-web.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 4 | ||||
| -rw-r--r-- | guix/build-system/pyproject.scm | 2 | ||||
| -rw-r--r-- | guix/build/pyproject-build-system.scm | 12 |
7 files changed, 17 insertions, 15 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 3bfb89bc33..80fb3bc47f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9332,8 +9332,9 @@ to guess the appropriate backend based on @file{pyproject.toml}. @code{#:test-backend} is added. It defaults to @code{#false} and will guess an appropriate test backend based on what is available in package inputs. @item -@code{#:test-flags} is added. The default is @code{#false}, and varies based -on the detected @code{#:test-backend}. +@code{#:test-flags} is added. The default is @code{'()}. These flags are +passed as arguments to the test command. Note that flags for verbose output +is always enabled on supported backends. @end itemize It is considered ``experimental'' in that the implementation details are diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index df3774e977..368aad49d6 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -598,8 +598,7 @@ process. FontParts is the successor of RoboFab.") (build-system pyproject-build-system) (arguments (list - #:test-flags #~'("-vv" - ;; These fail because the test data has not yet been + #:test-flags #~'(;; These fail because the test data has not yet been ;; updated for newer FontTools: ;; https://github.com/googlefonts/glyphsLib/issues/787 ;; Re-enable for versions > 6.0.7. diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 95cc3b1e22..070dc59ac0 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -739,7 +739,7 @@ extracting content or merging files.") (build-system pyproject-build-system) (arguments (list - #:test-flags #~'("-vv" "-c" "/dev/null"))) + #:test-flags #~'("-c" "/dev/null"))) (propagated-inputs (list python-pillow)) (native-inputs (list ghostscript @@ -1500,7 +1500,7 @@ manipulating PDF documents from the command line. It supports (build-system pyproject-build-system) (arguments (list - #:test-flags #~(list "-vv" "-c" "/dev/null" + #:test-flags #~(list "-c" "/dev/null" "-n" (number->string (parallel-job-count))) #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index cbc515fc64..59d677ca35 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1648,7 +1648,7 @@ JSON Schema Specification Draft 2020-12. (list ;; The example tests attempt to fetch resources from the Internet ;; (see: https://github.com/p1c2u/openapi-spec-validator/issues/151). - #:test-flags #~'("-vv" "-k" "not Example and not Exampe") + #:test-flags #~'("-k" "not Example and not Exampe") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-coverage-pytest-options diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 18089d090e..1c2f9d7b73 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12753,7 +12753,7 @@ invoked on those path objects directly.") ((#:tests? _ #f) (not (%current-target-system))) ((#:test-flags flags #~'()) - #~(append (list "-vv" "-k" + #~(append (list "-k" (string-append ;; Do not test the myproject.toml build as it tries ;; to pull dependencies from the Internet. @@ -21366,7 +21366,7 @@ particularly convenient for use in tests.") (arguments ;; Do not test the myproject.toml build as it tries to pull ;; dependencies from the Internet. - (list #:test-flags #~'("-vv" "-k" "not project"))) + (list #:test-flags #~'("-k" "not project"))) (native-inputs (list python-freezegun python-pytest diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm index 1e365d4f21..8f3b562ca3 100644 --- a/guix/build-system/pyproject.scm +++ b/guix/build-system/pyproject.scm @@ -95,7 +95,7 @@ (configure-flags ''()) (build-backend #f) (test-backend #f) - (test-flags #f) + (test-flags ''()) (phases '%standard-phases) (outputs '("out" "wheel")) (search-paths '()) diff --git a/guix/build/pyproject-build-system.scm b/guix/build/pyproject-build-system.scm index b969dd0379..c69ccc9d64 100644 --- a/guix/build/pyproject-build-system.scm +++ b/guix/build/pyproject-build-system.scm @@ -158,14 +158,16 @@ builder.build_wheel(sys.argv[2], config_settings=config_settings)" (format #t "Using ~a~%" use-test-backend) (match use-test-backend ('pytest - (apply invoke (cons pytest (or test-flags '("-vv"))))) + (apply invoke pytest "-vv" test-flags)) ('nose - (apply invoke (cons nosetests (or test-flags '("-v"))))) + (apply invoke nosetests "-v" test-flags)) ('nose2 - (apply invoke (cons nose2 (or test-flags '("-v" "--pretty-assert"))))) + (apply invoke nose2 "-v" "--pretty-assert" test-flags)) ('setup.py - (apply invoke (append '("python" "setup.py") - (or test-flags '("test" "-v"))))) + (apply invoke "python" "setup.py" + (if (null? test-flags) + '("test" "-v") + test-flags))) ;; The developer should explicitly disable tests in this case. (else (raise (condition (&test-system-not-found)))))) (format #t "test suite not run~%"))) |