me
/
guix
Archived
1
0
Fork 0
Code

gnu: python2: Fix test flags. 

Reverts a988393997 in favor of a cleaner
approach.

* gnu/packages/python.scm (python-2.7)[arguments]: 'EXTRATESTOPTS' ->
'TESTOPTS'.  This overrides the default '-l' argument for memory leak checks
which is not compatible with the -j for parallelism.
master
Eric Bavier 2019-01-22 22:00:50 -06:00
parent 85e4579469
commit 3292219097
No known key found for this signature in database
GPG Key ID: FD73CAC719D32566
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/python.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2017, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014, 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2014, 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015 Omar Radwan <toxemicsquire4@gmail.com> ;;; Copyright © 2015 Omar Radwan <toxemicsquire4@gmail.com>
;;; Copyright © 2015 Pierre-Antoine Rault <par@rigelk.eu> ;;; Copyright © 2015 Pierre-Antoine Rault <par@rigelk.eu>
@ -194,20 +194,12 @@
(assoc-ref %outputs "out") "/lib")) (assoc-ref %outputs "out") "/lib"))
;; With no -j argument tests use all available cpus, so provide one. ;; With no -j argument tests use all available cpus, so provide one.
#:make-flags #:make-flags
(list (format #f "EXTRATESTOPTS=-j~d" (parallel-job-count))) (list (format #f "TESTOPTS=-j~d" (parallel-job-count)))
#:modules ((ice-9 ftw) (ice-9 match) #:modules ((ice-9 ftw) (ice-9 match)
(guix build utils) (guix build gnu-build-system)) (guix build utils) (guix build gnu-build-system))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'remove-findleaks-from-testopts
(lambda _
(substitute* "Makefile.pre.in"
;; -l which is short for --findleaks isn't compatible with the
;; -j flag added through the #:make-flags, therefore remove
;; it. This only affects python-2.7.
(("TESTOPTS= -l ") "TESTOPTS= "))
#t))
(add-before (add-before
'configure 'patch-lib-shells 'configure 'patch-lib-shells
(lambda _ (lambda _