[bug#30853] [PATCH core-updates] build-system/gnu: Dump test suite logs upon 'check' failure.

[bug#30853] [PATCH core-updates] build-system/gnu: Dump test suite logs upon 'check' failure.

[Ludovic Courtès]

Suggested by Mark H Weaver <mhw@netris.org>.

* guix/build/gnu-build-system.scm (dump-file-contents): New procedure.
(%test-suite-log-regexp): New variable.
(check): Add #:test-suite-log-regexp.  Catch 'invoke-error?' and call
'dump-file-contents' upon error.
---
 guix/build/gnu-build-system.scm | 40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 8fe6fa8d6..2c0f60c9b 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -33,6 +33,7 @@
   #:use-module (rnrs io ports)
   #:export (%standard-phases
             %license-file-regexp
+            dump-file-contents
             gnu-build))
 
 ;; Commentary:
@@ -335,15 +336,44 @@ makefiles."
                  '())
            ,@make-flags)))
 
+(define* (dump-file-contents directory file-regexp
+                             #:optional (port (current-error-port)))
+  "Dump to PORT the contents of files in DIRECTORY that match FILE-REGEXP."
+  (define (dump file)
+    (let ((prefix (string-append "\n--- " file " ")))
+      (display (if (< (string-length prefix) 78)
+                   (string-pad-right prefix 78 #\---)
+                   prefix)
+               port)
+      (display "\n\n" port)
+      (call-with-input-file file
+        (lambda (log)
+          (dump-port log port)))
+      (display "\n" port)))
+
+  (for-each dump (find-files directory file-regexp)))
+
+(define %test-suite-log-regexp
+  ;; Name of test suite log files as commonly found in GNU-based build systems
+  ;; and CMake.
+  "^(test-?suite\\.log|LastTestFailed\\.log)$")
+
 (define* (check #:key target (make-flags '()) (tests? (not target))
                 (test-target "check") (parallel-tests? #t)
+                (test-suite-log-regexp %test-suite-log-regexp)
                 #:allow-other-keys)
   (if tests?
-      (apply invoke "make" test-target
-             `(,@(if parallel-tests?
-                     `("-j" ,(number->string (parallel-job-count)))
-                     '())
-               ,@make-flags))
+      (guard (c ((invoke-error? c)
+                 ;; Dump the test suite log to facilitate debugging.
+                 (display "\nTest suite failed, dumping logs.\n"
+                          (current-error-port))
+                 (dump-file-contents "." test-suite-log-regexp)
+                 (raise c)))
+        (apply invoke "make" test-target
+               `(,@(if parallel-tests?
+                       `("-j" ,(number->string (parallel-job-count)))
+                       '())
+                 ,@make-flags)))
       (format #t "test suite not run~%"))
   #t)
 
-- 
2.16.2

[bug#30853] [PATCH core-updates] build-system/gnu: Dump test suite logs upon 'check' failure.

[Mark H Weaver]

Ludovic Courtès <ludo@gnu.org> writes:

> Suggested by Mark H Weaver <mhw@netris.org>.
>
> * guix/build/gnu-build-system.scm (dump-file-contents): New procedure.
> (%test-suite-log-regexp): New variable.
> (check): Add #:test-suite-log-regexp.  Catch 'invoke-error?' and call
> 'dump-file-contents' upon error.

Looks good to me.  Thank you!

     Mark

bug#30853: [PATCH core-updates] build-system/gnu: Dump test suite logs upon 'check' failure.

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Suggested by Mark H Weaver <mhw@netris.org>.
>>
>> * guix/build/gnu-build-system.scm (dump-file-contents): New procedure.
>> (%test-suite-log-regexp): New variable.
>> (check): Add #:test-suite-log-regexp.  Catch 'invoke-error?' and call
>> 'dump-file-contents' upon error.
>
> Looks good to me.  Thank you!

Pushed, thanks!

Ludo’.