From 41da613ba3f880475c783da4925caeb2395631d7 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sun, 26 Feb 2023 23:36:53 -0500
Subject: gnu: openssl-1.1: Specify TESTS Make variable via #:make-flags.

* gnu/packages/tls.scm (openssl-1.1) [make-flags]: New field.
[phases] {check}: Remove phase override.
---
 gnu/packages/tls.scm | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 70d985da14..90147ed805 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -449,6 +449,15 @@ OpenSSL for TARGET."
     (arguments
      (list
       #:parallel-tests? #f
+      #:make-flags
+      ;; 'test_ssl_new.t' in 1.1.1n and 3.0.3 fails due to an expired
+      ;; certificate: <https://github.com/openssl/openssl/issues/18441>.  Skip
+      ;; it.
+      #~(list #$@(if (or (target-arm?) (target-riscv64?))
+                     ;; 'test_afalg' seems to be dependent on kernel features:
+                     ;; <https://github.com/openssl/openssl/issues/12242>.
+                     #~("TESTS=-test_afalg -tls_ssl_new")
+                     #~("TESTS=-test_ssl_new")))
       #:test-target "test"
       ;; Changes to OpenSSL sometimes cause Perl to "sneak in" to the closure,
       ;; so we explicitly disallow it here.
@@ -463,20 +472,6 @@ OpenSSL for TARGET."
                                 #$(target->openssl-target
                                    (%current-target-system))))))
                  #~())
-          (replace 'check
-            (lambda* (#:key tests? test-target #:allow-other-keys)
-              (when tests?
-                ;; 'test_ssl_new.t' in 1.1.1n and 3.0.3 fails due to an expired
-                ;; certificate:
-                ;; <https://github.com/openssl/openssl/issues/18441>.
-                ;; Skip it.
-                ;;
-                ;; 'test_afalg' seems to be dependent on kernel features:
-                ;; <https://github.com/openssl/openssl/issues/12242>.
-                (invoke "make" test-target
-                        #$(if (or (target-arm?) (target-riscv64?))
-                              "TESTS=-test_afalg -tls_ssl_new"
-                              "TESTS=-test_ssl_new")))))
           (replace 'configure
             (lambda* (#:key configure-flags #:allow-other-keys)
               ;; It's not a shebang so patch-source-shebangs misses it.
-- 
cgit 1.4.1