diff options
author | Ludovic Courtès <ludo@gnu.org> | 2020-04-15 16:09:18 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2020-04-15 16:09:18 +0200 |
commit | b4440de133401abc6ce8be6c1c2e720efd9b2ba3 (patch) | |
tree | 0d235e79790239daafbe26e1054b45672067f149 /gnu/packages/virtualization.scm | |
parent | 141262f266ab702c856f634889d4130ae661e79f (diff) | |
parent | 33ff35d57095bb1283e9fb40edc24556f9a43682 (diff) | |
download | guix-b4440de133401abc6ce8be6c1c2e720efd9b2ba3.tar.gz |
Merge branch 'version-1.1.0'
Diffstat (limited to 'gnu/packages/virtualization.scm')
-rw-r--r-- | gnu/packages/virtualization.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index c00f3ef9a8..be17ec15f0 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016, 2017, 2018. 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> @@ -129,9 +129,15 @@ "1w38hzlw7xp05gcq1nhga7hxvndxy6dfcnzi7q2il8ff110isj6k")))) (build-system gnu-build-system) (arguments - '(;; Running tests in parallel can occasionally lead to failures, like: + `(;; Running tests in parallel can occasionally lead to failures, like: ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead) #:parallel-tests? #f + + ;; FIXME: Disable tests on i686 to work around + ;; <https://bugs.gnu.org/40527>. + #:tests? ,(or (%current-target-system) + (not (string=? "i686-linux" (%current-system)))) + #:configure-flags (list "--enable-usb-redir" "--enable-opengl" "--enable-docs" (string-append "--smbd=" |