[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#38460] [PATCH 1/1] lint: Add '--load-path' option.
From: |
zimoun |
Subject: |
[bug#38460] [PATCH 1/1] lint: Add '--load-path' option. |
Date: |
Mon, 2 Dec 2019 22:01:27 +0100 |
* 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 <address@hidden>
;;; Copyright © 2017, 2018 Efraim Flashner <address@hidden>
;;; Copyright © 2018, 2019 Arun Isaac <address@hidden>
+;;; Copyright © 2019 Simon Tournier <address@hidden>
;;;
;;; 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
--
2.23.0
- [bug#38460] [PATCH 0/1] lint: Add '--load-path' option., zimoun, 2019/12/02
- [bug#38460] [PATCH 1/1] lint: Add '--load-path' option.,
zimoun <=
- [bug#38460] [PATCH 1/1] lint: Add '--load-path' option., Ludovic Courtès, 2019/12/04
- [bug#38460] [PATCH v2] lint: Add '--load-path' option., zimoun, 2019/12/04
- [bug#38460] [PATCH 1/1] lint: Add '--load-path' option., zimoun, 2019/12/04
- [bug#38460] [PATCH 1/1] lint: Add '--load-path' option., Ludovic Courtès, 2019/12/07
- [bug#38460] [PATCH 1/1] lint: Add '--load-path' option., zimoun, 2019/12/08
- bug#38460: [PATCH 1/1] lint: Add '--load-path' option., Ludovic Courtès, 2019/12/08