From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id oH8sO9LIWWCYBgAA0tVLHw (envelope-from ) for ; Tue, 23 Mar 2021 10:54:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +J/bNtLIWWC+OgAAbx9fmQ (envelope-from ) for ; Tue, 23 Mar 2021 10:54:10 +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 9F6352089C for ; Tue, 23 Mar 2021 11:54:10 +0100 (CET) Received: from localhost ([::1]:39480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOefp-0007u7-D6 for larch@yhetil.org; Tue, 23 Mar 2021 06:54:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOefi-0007sw-QF for guix-patches@gnu.org; Tue, 23 Mar 2021 06:54:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48121) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOefi-0003RO-IV for guix-patches@gnu.org; Tue, 23 Mar 2021 06:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lOefi-0007G4-G9 for guix-patches@gnu.org; Tue, 23 Mar 2021 06:54:02 -0400 Subject: bug#47332: [PATCH 2/2] Enable test of minetest Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 23 Mar 2021 10:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 47332 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: la snesne , 47332-done@debbugs.gnu.org Mail-Followup-To: 47332@debbugs.gnu.org, leo.prikler@student.tugraz.at, lasnesne@lagunposprasihopre.org Received: via spool by 47332-done@debbugs.gnu.org id=D47332.161649679227832 (code D ref 47332); Tue, 23 Mar 2021 10:54:02 +0000 Received: (at 47332-done) by debbugs.gnu.org; 23 Mar 2021 10:53:12 +0000 Received: from localhost ([127.0.0.1]:59666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOeet-0007Ep-LH for submit@debbugs.gnu.org; Tue, 23 Mar 2021 06:53:11 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:40177) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOeeo-0007Ed-C2 for 47332-done@debbugs.gnu.org; Tue, 23 Mar 2021 06:53:10 -0400 Received: from nijino.local (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4F4Srb1cF4z3x7l; Tue, 23 Mar 2021 11:53:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1616496783; bh=g1CfiRg85HmDB9HAF136ubyNpp73kSAkpIJpMpCL8bA=; h=Subject:From:To:Date:In-Reply-To:References; b=AWe1+56oN8XyVESmYQL+f0dc+rWFFvIf4bxS7OcHISu8hXcN7qY1uERLrkQLdIRJ0 5idIEMwcjo96K5HgCHRjuaUSx2X0myopP98M0F7y3qNr8vF7f6H5b0+6MD1T7Pximh Z4/SnHsiSQdcNt4w4xoEeIR0bGd18QtFSAPH5Ndw= Message-ID: <0b7ab28064bbfe4ab50b24be2c5551982c1fa135.camel@student.tugraz.at> From: Leo Prikler Date: Tue, 23 Mar 2021 11:53:01 +0100 In-Reply-To: <20210323002804.4050-1-lasnesne@lagunposprasihopre.org> References: <20210323002804.4050-1-lasnesne@lagunposprasihopre.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 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=1616496850; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-to: 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:dkim-signature; bh=g1CfiRg85HmDB9HAF136ubyNpp73kSAkpIJpMpCL8bA=; b=MZ0t/01QKmi5m+d5bXQZyabaCPiuStcmOaH/3xiK3ooUNz53s0WdzrzfP1HDlPKaYaFiAH KQFse24x5T7fmwx5bssfgD+y/3GNQylUNMggJvv75xNEQK8JwfCYIwABnI6tprwoDwJGOu MWTeJQAlaqsBnMd+K4ScYbvndOiI8LrWs6wH1ASMB3xlA+ZKuqEMccWS078M8pXOhGvg3V mLp4AEQm65xUOTwSHnJF9qVPfTuIueodSTUSmOf0d/Mk8G5RsLGKsJMS/u0HZ5JOv0fQRX jci5IBX0HemjabOQ8Ev3D8frgqV70r5aBBjzgWLjcW3F/OpCiDe3oPxQ/Jk5fA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616496850; a=rsa-sha256; cv=none; b=uClNHCwISVBbEf/qdNrDQYMhUmrzHddE4ArsMozlUP+NPhacPXoOyrbRko4bd24T4cGMh3 gJ2J0FY6rTCQS3ks/0JMo4ndZ1WKvLgIzPPnXJp7+RE7JHEvtMkPjMp+1nTHYm4LWAcftM KOvJFupAbl0V3iEsmzBMeLu01U3HpXwG0HTWRcUjCuG/g8H8luBwu4NjFVqwteq4uAAvlq Qrljb0tEKYokzbttMIIkhoC3RIsndCTdiKgVXP6PqcblXf7JdNFWWUQECnv9QMWDYzUcNm 6DRv6V2iN/Q4VgAiJxmLS0WnzSl9jdiWqSNdkRvW2Y6T7KKzly2tc+k5jZGAaA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=AWe1+56o; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); 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: -1.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=AWe1+56o; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); 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: 9F6352089C X-Spam-Score: -1.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: 9hNLkdDmGTmy Hi, Am Dienstag, den 23.03.2021, 09:06 +0900 schrieb la snesne: > - (version "5.3.0") > + (version "5.4.0") > (source (origin > (method git-fetch) > (uri (git-reference > @@ -3473,7 +3473,7 @@ match, cannon keep, and grave-itation pit.") > (file-name (git-file-name name version)) > (sha256 > (base32 > - "03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh > 6")) > + "1a17g6cmxrscnqwpwrd4w2ck3dgvplyfq4kzyimilfpqar1q69j > 9")) > (modules '((guix build utils))) > (snippet > '(begin > @@ -3541,7 +3541,7 @@ in different ways.") > (file-name (git-file-name name version)) > (sha256 > (base32 > - "1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cj > x")))) > + "11dz36z0pj2r7i8xm8v5lskzws81ckj6sc0avlmvdl8qdc9x83w > 5")))) Applied with changes to the commit message. Am Dienstag, den 23.03.2021, 09:28 +0900 schrieb la snesne: > --- > gnu/packages/games.scm | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm > index f1ee7e9971..0ccbde636a 100644 > --- a/gnu/packages/games.scm > +++ b/gnu/packages/games.scm > @@ -3482,7 +3482,7 @@ match, cannon keep, and grave-itation pit.") > #t)))) > (build-system cmake-build-system) > (arguments > - '(#:configure-flags > + `(#:configure-flags > (list "-DRUN_IN_PLACE=0" > "-DENABLE_FREETYPE=1" > "-DENABLE_GETTEXT=1" > @@ -3493,7 +3493,15 @@ match, cannon keep, and grave-itation pit.") > (string-append "-DCURL_INCLUDE_DIR=" > (assoc-ref %build-inputs "curl") > "/include/curl")) > - #:tests? #f)) ;no check target > + #:phases > + (modify-phases %standard-phases > + (replace 'check > + (lambda _ > + (setenv "HOME" "/tmp") > + (invoke (string-append "../" ,name "-" ,version > + "-checkout/bin/minetest") > + "--run-unittests") > + #t))))) > (native-search-paths > (list (search-path-specification > (variable "MINETEST_SUBGAME_PATH") Instead of constructing the name like you did, I patched CMakeLists to put the binaries into the build folder. I also ensured, that cross- compilation would work (like Maxime said) and that unittests can meaningfully be executed after installation. Finally, as before, I rewrote the commit message. The changed patches are now upstream as of 7fc1fac64a8d800d651f55a80ff158abd7a90ccb. Regards, Leo