summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-11-11 22:28:46 +0100
committerLudovic Courtès <ludo@gnu.org>2019-11-13 23:26:35 +0100
commit887fd835a7c90f720d36a211478012547feaead0 (patch)
treec62f3a640d529bc139a05234bb6f1ffdf45f1072
parentf041db8696c7e8073761af5aa8f7599eec1d5174 (diff)
tests: "make check-system" uses Guix built with (guix self).
This is a followup to 7e6d8d366a61f951936ed83371877ce006f679f6. It means that "make check-system" can run tests from (gnu tests install) much faster because it does not need to build a full 'guix' package. * gnu/ci.scm (channel-instance->package): Export. * build-aux/run-system-tests.scm (tests-for-channel-instance): New procedure, with code formerly in 'run-system-tests'. (run-system-tests): Call 'interned-file' for SOURCE, and add call to 'tests-for-channel-instance'.
-rw-r--r--build-aux/run-system-tests.scm45
-rw-r--r--gnu/ci.scm3
2 files changed, 37 insertions, 11 deletions
diff --git a/build-aux/run-system-tests.scm b/build-aux/run-system-tests.scm
index 18f7393d81..b0cb3bd2bf 100644
--- a/build-aux/run-system-tests.scm
+++ b/build-aux/run-system-tests.scm
@@ -18,10 +18,15 @@
(define-module (run-system-tests)
#:use-module (gnu tests)
+ #:use-module (gnu packages package-management)
+ #:use-module ((gnu ci) #:select (channel-instance->package))
#:use-module (guix store)
#:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix monads)
+ #:use-module (guix channels)
#:use-module (guix derivations)
+ #:use-module ((guix git-download) #:select (git-predicate))
+ #:use-module (guix utils)
#:use-module (guix ui)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-34)
@@ -46,28 +51,48 @@
lst)
(lift1 reverse %store-monad))))
-(define (run-system-tests . args)
- (define tests
- ;; Honor the 'TESTS' environment variable so that one can select a subset
- ;; of tests to run in the usual way:
- ;;
- ;; make check-system TESTS=installed-os
+(define (tests-for-channel-instance instance)
+ "Return a list of tests for perform, using Guix from INSTANCE, a channel
+instance."
+ ;; Honor the 'TESTS' environment variable so that one can select a subset
+ ;; of tests to run in the usual way:
+ ;;
+ ;; make check-system TESTS=installed-os
+ (parameterize ((current-guix-package
+ (channel-instance->package instance)))
(match (getenv "TESTS")
(#f
(all-system-tests))
((= string-tokenize (tests ...))
(filter (lambda (test)
(member (system-test-name test) tests))
- (all-system-tests)))))
+ (all-system-tests))))))
+
- (format (current-error-port) "Running ~a system tests...~%"
- (length tests))
+
+(define (run-system-tests . args)
+ (define source
+ (string-append (current-source-directory) "/.."))
(with-store store
(with-status-verbosity 2
(run-with-store store
- (mlet* %store-monad ((drv (mapm %store-monad system-test-value tests))
+ ;; Intern SOURCE so that 'build-from-source' in (guix channels) sees
+ ;; "fresh" file names and thus doesn't find itself loading .go files
+ ;; from ~/.cache/guile when it loads 'build-aux/build-self.scm'.
+ ;; XXX: It would be best to not do it upfront because we may need it.
+ (mlet* %store-monad ((source (interned-file source "guix-source"
+ #:recursive? #t
+ #:select?
+ (or (git-predicate source)
+ (const #t))))
+ (instance -> (checkout->channel-instance source))
+ (tests -> (tests-for-channel-instance instance))
+ (drv (mapm %store-monad system-test-value tests))
(out -> (map derivation->output-path drv)))
+ (format (current-error-port) "Running ~a system tests...~%"
+ (length tests))
+
(mbegin %store-monad
(show-what-to-build* drv)
(set-build-options* #:keep-going? #t #:keep-failed? #t
diff --git a/gnu/ci.scm b/gnu/ci.scm
index 5d5a826647..f24049e772 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -54,7 +54,8 @@
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)
- #:export (hydra-jobs))
+ #:export (channel-instance->package
+ hydra-jobs))
;;; Commentary:
;;;