From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id PffWFOSr8WAyRAEAgWs5BA (envelope-from ) for ; Fri, 16 Jul 2021 17:55:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id IK4NEOSr8WBjGwAAB5/wlQ (envelope-from ) for ; Fri, 16 Jul 2021 15:55:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E64812BACA for ; Fri, 16 Jul 2021 17:55:15 +0200 (CEST) Received: from localhost ([::1]:36210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4QBG-0002uq-Rd for larch@yhetil.org; Fri, 16 Jul 2021 11:55:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4QB4-0002uJ-Uy for guix-patches@gnu.org; Fri, 16 Jul 2021 11:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40602) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4QB4-0005lE-O5 for guix-patches@gnu.org; Fri, 16 Jul 2021 11:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m4QB4-00032E-OR for guix-patches@gnu.org; Fri, 16 Jul 2021 11:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49597] [PATCH core-updates 03/15] gnu: Simplify "Xvbf" invocation in pre-check phases. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Jul 2021 15:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49597@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 49597-submit@debbugs.gnu.org id=B49597.162645088711595 (code B ref 49597); Fri, 16 Jul 2021 15:55:02 +0000 Received: (at 49597) by debbugs.gnu.org; 16 Jul 2021 15:54:47 +0000 Received: from localhost ([127.0.0.1]:52136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4QAo-00030v-JS for submit@debbugs.gnu.org; Fri, 16 Jul 2021 11:54:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43126) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4QAl-00030O-AI for 49597@debbugs.gnu.org; Fri, 16 Jul 2021 11:54:43 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33714) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4QAg-0005Up-2E; Fri, 16 Jul 2021 11:54:38 -0400 Received: from vpn-0-27.aquilenet.fr ([2a0c:e300:4:27::]:38216 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4QAf-0004IN-IU; Fri, 16 Jul 2021 11:54:38 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 16 Jul 2021 17:54:08 +0200 Message-Id: <20210716155420.32447-3-ludo@gnu.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210716155420.32447-1-ludo@gnu.org> References: <20210716155420.32447-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626450916; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=AeKvPZMByhYhrFeABQkAvaLdTW0DkfqlVAV4nwashzo=; b=o6JKRknHqsVRrivGIHNInNA+Iw9Oxezisn2itIB3Vb7Ws/ctbuYGx++XSyVD51LD9+ztYV FMpfpgv/cNiYqwHkb71IRYVtC+YclJvS2nUpobjbYijTXGAmXyPROAlE/C5GBXZ8D7Qo/x klpqUz8uIUxKh32PHEESpIS67bCxGpxtZTxwgOdmKdG96f17Gpxcg3+Jta7pYkJR+cuYNh 19b+qxfCfT0ZesB8E2AF0bH90BaFg5rD36nv6lTFUfL+Y7QxcB/74yFE+C7ckh9eMM7/Rf K3XvEkp5MY4f6GsnTu7LerbRmVAPzh4SEsE7kPtTL/QyBTUN6Aa202E5ymxbLg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626450916; a=rsa-sha256; cv=none; b=R6w3zKjdhmJEDfbjShavB8exx7+HltC/lbXCwarERTzRjCvWss/r5GegO8SUUXURJSmwNZ HmK2a6LGjp3Md67/kK/xkXrh7BMeH8TwPBulwTTikr6CqXH/cqceaUx7PcdNb1Psy2PC3Y WsktXkjmzX18uuF+BpztPyZxij5ASF5sjLdu2F7Ve7cRgOkUJtmteNS4u2R/iExEF2xEVy A6rfRe58Ffh2uHbOMlFwU0Tgg9oUayfCCwsNoEjdQkY7HdIQG8wqGd7xjdPvB6B2jaPUt4 mFGb2B2fTmRCUFDuZBH7q6DLAx5JeORDoPoZytaU0jyeuEjVEJKfiPaNef6s+Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.09 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: E64812BACA X-Spam-Score: 2.09 X-Migadu-Scanner: scn0.migadu.com X-TUID: OGrPgDFA06jq * gnu/packages/geo.scm (qgis)[arguments]: Simplify invocation of 'Xvfb' in 'check' phase, assuming 'Xvfb' is in $PATH. * gnu/packages/graphics.scm (opensubdiv)[arguments]: Likewise. * gnu/packages/java-graphics.scm (java-piccolo2d-extras)[arguments]: Likewise. * gnu/packages/kde-frameworks.scm (kcontacts)[arguments]: Likewise. (kdeclarative)[arguments]: Likewise. * gnu/packages/kde-multimedia.scm (elisa)[arguments]: Likewise. * gnu/packages/kde-plasma.scm (kscreenlocker)[arguments]: Likewise. * gnu/packages/radio.scm (gnuradio)[arguments]: Likewise. * gnu/packages/education.scm (gcompris-qt)[arguments]: Likewise. * gnu/packages/freedesktop.scm (weston)[arguments]: Likewise. --- gnu/packages/education.scm | 3 +-- gnu/packages/freedesktop.scm | 3 +-- gnu/packages/geo.scm | 3 +-- gnu/packages/graphics.scm | 3 +-- gnu/packages/java-graphics.scm | 3 +-- gnu/packages/kde-frameworks.scm | 6 ++---- gnu/packages/kde-multimedia.scm | 3 +-- gnu/packages/kde-plasma.scm | 3 +-- gnu/packages/radio.scm | 3 +-- 9 files changed, 10 insertions(+), 20 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index d815c6e689..14ebe4fffd 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -157,8 +157,7 @@ of categories with some of the activities available in that category. (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) + (system "Xvfb :1 &") (setenv "DISPLAY" ":1") ;; The test suite wants to write to /homeless-shelter (setenv "HOME" (getcwd)) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 5c76e6b8f0..3e052a5697 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1134,8 +1134,7 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.") (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) + (system "Xvfb :1 &") (setenv "DISPLAY" ":1") #t))))) (home-page "https://wayland.freedesktop.org") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 546be33e55..851bfcfa2e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2210,8 +2210,7 @@ growing set of geoscientific methods.") (replace 'check (lambda* (#:key inputs #:allow-other-keys) (setenv "HOME" "/tmp") - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) + (system "Xvfb :1 &") (setenv "DISPLAY" ":1") (setenv "TRAVIS" "true") (setenv "CTEST_OUTPUT_ON_FAILURE" "1") diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index e0cade6359..3735a860b1 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1705,8 +1705,7 @@ requirements.") (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) + (system "Xvfb :1 &") (setenv "DISPLAY" ":1") #t))))) (native-inputs diff --git a/gnu/packages/java-graphics.scm b/gnu/packages/java-graphics.scm index f7a89021cd..960579f770 100644 --- a/gnu/packages/java-graphics.scm +++ b/gnu/packages/java-graphics.scm @@ -75,8 +75,7 @@ libraries.") (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (system "Xvfb :1 -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") #t))))) (inputs diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 7a3b6b26a8..4fd0817753 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1641,8 +1641,7 @@ integrated it into your application's other widgets.") ;; Xvfb doesn't have proper glx support and needs a pixeldepth ;; of 24 bit to avoid "libGL error: failed to load driver: swrast" ;; "Could not initialize GLX" - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (system "Xvfb :1 -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") #t))))) (home-page "https://community.kde.org/Frameworks") @@ -2386,8 +2385,7 @@ their settings.") (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server, setting ;; QT_QPA_PLATFORM=offscreen does not suffice. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (system "Xvfb :1 -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") #t))))) (home-page "https://community.kde.org/Frameworks") diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 21ca996246..4e28fe1367 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -186,8 +186,7 @@ This package is part of the KDE multimedia module.") (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server, setting ;; QT_QPA_PLATFORM=offscreen does not suffice. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (system "Xvfb :1 -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") #t)) (replace 'check diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index b7a2b14f65..96e7ec6907 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -154,8 +154,7 @@ call it if it is not associated to a terminal.") (modify-phases %standard-phases (add-before 'check 'check-setup (lambda* (#:key inputs outputs #:allow-other-keys) - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (system "Xvfb :1 -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") #t)) (delete 'check) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 9a64686c50..26fd22db88 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -571,8 +571,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") (add-before 'check 'set-test-environment (lambda* (#:key inputs #:allow-other-keys) (setenv "HOME" "/tmp") - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) + (system "Xvfb :1 &") (setenv "DISPLAY" ":1") #t)) (replace 'check -- 2.32.0