From patchwork Mon Dec 2 21:01:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 16345 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EE82F177FF; Mon, 2 Dec 2019 21:02:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id AC3C2177ED for ; Mon, 2 Dec 2019 21:02:25 +0000 (GMT) Received: from localhost ([::1]:44444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibsps-0007yu-SP for patchwork@mira.cbaines.net; Mon, 02 Dec 2019 16:02:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57875) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibspX-0007ux-HV for guix-patches@gnu.org; Mon, 02 Dec 2019 16:02:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibspW-0002UU-8q for guix-patches@gnu.org; Mon, 02 Dec 2019 16:02:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33067) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibspW-0002UA-3S for guix-patches@gnu.org; Mon, 02 Dec 2019 16:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibspW-0000HL-1D for guix-patches@gnu.org; Mon, 02 Dec 2019 16:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38460] [PATCH 1/1] lint: Add '--load-path' option. References: <20191202204759.28329-1-zimon.toutoune@gmail.com> In-Reply-To: <20191202204759.28329-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Dec 2019 21:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38460 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38460@debbugs.gnu.org Cc: zimoun Received: via spool by 38460-submit@debbugs.gnu.org id=B38460.15753204981043 (code B ref 38460); Mon, 02 Dec 2019 21:02:01 +0000 Received: (at 38460) by debbugs.gnu.org; 2 Dec 2019 21:01:38 +0000 Received: from localhost ([127.0.0.1]:39040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibsp8-0000Gl-GG for submit@debbugs.gnu.org; Mon, 02 Dec 2019 16:01:38 -0500 Received: from mail-wm1-f53.google.com ([209.85.128.53]:35216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibsp5-0000GY-Uf for 38460@debbugs.gnu.org; Mon, 02 Dec 2019 16:01:36 -0500 Received: by mail-wm1-f53.google.com with SMTP id u8so1110839wmu.0 for <38460@debbugs.gnu.org>; Mon, 02 Dec 2019 13:01:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xFkwZNwJSrza9VG6J19ZDC/FWfrXPpbJrmW/NmHZXog=; b=AHmjF/QqMsfQCOG8w+Kf1zR43yC6sXMkTWeUNA/hN6YXkwMm/3fe8+WNwGan4gsC0u JJQZbIV7WHjWPD/3xXn9vlUA4fn6IMonMVplWf7utfKJ7BczSWgcsfzhzCEq/yLXTLel YDJpr+BaJD6bolnda24HkAVxSV+rpG02Fpdop5gHUXZr8NLns17QyonW0fRpSrxHEntc TiiZUvurrKQ+G6mfBSL3leVE1xs7Je8Qhg4yQjcaBpku7+drxmj2gkqixS+4qBuQqHgn +OOcGEDTPR2aLAIYhkN3qR7XDZRguX1CKOFnhPPXYV0jKQSZqSMIEzPcsPVMJSOyMwbx exZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xFkwZNwJSrza9VG6J19ZDC/FWfrXPpbJrmW/NmHZXog=; b=bE+Peb5/69jP2KWLoeMrjBgjrj6fCgTkDbBf+zGHe7lqodGXIYe6foViEEgSHMoA9R n/ZCL3ax7ymN8JYGY6oFubZsQXGsapQtvzhzlyCVnAxTrjbjoxm63n3QbdRvkK6Ab985 K2DE7HG63Jx1S6SCIyQr0bFf1jtUQx87HOfkwHrjlDVRdZ5fPfbHf598IRHZxPzY1eD0 O40RI3aqXhOlZhuRHzoQtmlXEj07hH9dbnluptVlbQ0BYr8685rR1F8ukaw7cTYGKY1G iHGHK9tbD9DaKjEqnPmypSPX1EoIvSbXYluPqB0sTADplBYOavzC8Qe/kmgzYbt5/gGb i1xQ== X-Gm-Message-State: APjAAAUGfVgDzVU1neJlm1/3y2SDKE1fnQlNEBZeYqJowjQ5sayf2Scs 6jYW0/V6YtAaZ7SpQP/gY9FehVr6BTw= X-Google-Smtp-Source: APXvYqzplU+k90B94GKjMfN9+sIe/Lu5wPPiYBXEoKTsAWIz4gb8hZ74ER+6fFzsEfQacAfCSFk4jw== X-Received: by 2002:a1c:7910:: with SMTP id l16mr11066987wme.27.1575320489759; Mon, 02 Dec 2019 13:01:29 -0800 (PST) Received: from pfiuh02.univ-paris-diderot.fr ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id i10sm615052wmf.20.2019.12.02.13.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 13:01:29 -0800 (PST) From: zimoun Date: Mon, 2 Dec 2019 22:01:27 +0100 Message-Id: <20191202210127.28466-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/lint.scm (%options): Add '--load-path' option. * tests/guix-lint.sh: Test it. --- guix/scripts/lint.scm | 8 ++++++++ tests/guix-lint.sh | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm index 1668d02992..8d08c484f5 100644 --- a/guix/scripts/lint.scm +++ b/guix/scripts/lint.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018, 2019 Arun Isaac +;;; Copyright © 2019 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ #:use-module (guix lint) #:use-module (guix ui) #:use-module (guix scripts) + #:use-module (guix scripts build) #:use-module (gnu packages) #:use-module (ice-9 match) #:use-module (ice-9 format) @@ -94,6 +96,9 @@ run the checkers on all packages.\n")) -c, --checkers=CHECKER1,CHECKER2... only run the specified checkers")) (display (G_ " + -L, --load-path=DIR prepend DIR to the package module search path")) + (newline) + (display (G_ " -h, --help display this help and exit")) (display (G_ " -l, --list-checkers display the list of available lint checkers")) @@ -128,6 +133,9 @@ run the checkers on all packages.\n")) %local-checkers (alist-delete 'checkers result)))) + (find (lambda (option) + (member "load-path" (option-names option))) + %standard-build-options) (option '(#\h "help") #f #f (lambda args (show-help) diff --git a/tests/guix-lint.sh b/tests/guix-lint.sh index 7ddc7c265b..f07ccb4e1a 100644 --- a/tests/guix-lint.sh +++ b/tests/guix-lint.sh @@ -76,3 +76,15 @@ then true; else false; fi # Make sure specifying multiple packages works. guix lint -c inputs-should-be-native dummy dummy@42 dummy + + +# Use --load-path instead. +unset GUIX_PACKAGE_PATH +LOAD_PATH="$module_dir" + +out=`guix lint -L $LOAD_PATH -c synopsis,description dummy 2>&1` +if [ `grep_warning "$out"` -ne 3 ] +then false; else true; fi + +# Make sure specifying multiple packages works. +guix lint -L $LOAD_PATH -c inputs-should-be-native dummy dummy@42 dummy