From cf6ce3e6ef96abc36a40293b2d9f732d462d2a94 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 26 Feb 2015 00:00:04 +0100
Subject: ui: Honor --no-* options passed via $GUIX_BUILD_OPTIONS.

Reported by Alex Kost <alezost@gmail.com>
at <http://lists.gnu.org/archive/html/guix-devel/2015-02/msg00702.html>.

* guix/ui.scm (parse-command-line)[parse-options-from]: Add 'seeds'
  parameter.
  Thread the result of the first 'parse-options-from' call to the
  second.
---
 tests/ui.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'tests/ui.scm')

diff --git a/tests/ui.scm b/tests/ui.scm
index c71fc71cc1..1478fe213e 100644
--- a/tests/ui.scm
+++ b/tests/ui.scm
@@ -82,6 +82,15 @@ (define-syntax-rule (with-environment-variable variable value body ...)
                         %standard-build-options
                         (list '()))))
 
+(test-equal "parse-command-line and --no options"
+  '((argument . "foo")
+    (substitutes? . #f))                          ;takes precedence
+
+  (with-environment-variable "GUIX_BUILD_OPTIONS" "--no-substitutes"
+    (parse-command-line '("foo")
+                        %standard-build-options
+                        (list '((substitutes? . #t))))))
+
 (test-assert "fill-paragraph"
   (every (lambda (column)
            (every (lambda (width)
-- 
cgit v1.2.3