gnu: Use argument for test exclusion.

* gnu/packages/fontutils.scm (fontforge, graphite2)
[arguments]<#:test-exclude>: Move regex from custom 'check phase.

Change-Id: I51d1480b9fd87b7e32b7d09e24b73c9d93729b8d

gnu/packages/fontutils.scm

@@ -1536,22 +1536,7 @@ translated keywords and acts.")
     (list freetype))
    (arguments
     (if (system-hurd?)
-        (list
+        (list #:test-exclude "awamicmp3")
-         #:phases
-         #~(modify-phases %standard-phases
-             (replace 'check
-               ;; cmake-build-system ignores #:make-flags for make check
-               (lambda* (#:key test-target tests? parallel-tests?
-                         #:allow-other-keys)
-                 (if tests?
-                     (let ((jobs (if parallel-tests?
-                                     (number->string (parallel-job-count))
-                                     "1")))
-                       (invoke "make"
-                               (string-append
-                                "ARGS=-j " jobs " --exclude-regex ^awamicmp3$")
-                               test-target))
-                     (format #t "test suite not run~%"))))))
         '()))
    (synopsis "Reimplementation of the SIL Graphite text processing engine")
    (description
@@ -1731,6 +1716,10 @@ definitions.")
            python
            zlib))
     (arguments
+     (append
+      (if (system-hurd?)
+          (list #:test-exclude "test0001_py|test0001_pyhook")
+          '())
       (list
        #:configure-flags #~`(;; TODO: Provide GTK+ for the Wayland-friendly GDK
                              ;; backend, instead of the legacy X11 backend.
@@ -1759,25 +1748,6 @@ definitions.")
                                    (search-patch "fontforge-hurd.patch"))))
                            (invoke "patch" "--force" "-p1" "-i" patch-file)))))
                   #~())
-          #$@(if (system-hurd?)
-                 #~((replace 'check
-                      ;; cmake-build-system ignores #:make-flags for make check
-                      (lambda* (#:key test-target tests? parallel-tests?
-                                #:allow-other-keys)
-                        (let ((skip '("test0001_py" "test0001_pyhook")))
-                          (if tests?
-                              (let ((jobs
-                                     (if parallel-tests?
-                                         (number->string (parallel-job-count))
-                                         "1")))
-                                (invoke "make"
-                                        (string-append "ARGS=-j " jobs
-                                                       " --exclude-regex ^"
-                                                       (string-join skip "\\|")
-                                                       "$")
-                                        test-target))
-                              (format #t "test suite not run~%"))))))
-                 #~())
            (add-after 'install 'set-library-path
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let ((out (assoc-ref outputs "out"))
@@ -1793,7 +1763,7 @@ definitions.")
                              "libxml2" "zlib" "libspiro" "freetype"
                              "pango" "cairo" "fontconfig-minimal")))
                    ;; Checks for potrace program at runtime
-                  `("PATH" ":" prefix (,potrace)))))))))
+                   `("PATH" ":" prefix (,potrace))))))))))
     (synopsis "Outline font editor")
     (description
      "FontForge allows you to create and modify postscript, truetype and