about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner2022-04-04 15:13:39 +0300
committerEfraim Flashner2022-04-04 15:14:04 +0300
commitfc38fcc5f4c37a749d64c38da229c8bfa8b6bce9 (patch)
treedf41b287df22d50a84254f75fc4bc1a6c7cf5aa7
parent7e8a1de4b293e5e1d4c0c5e3694acb144a145635 (diff)
downloadguix-bioinformatics-fc38fcc5f4c37a749d64c38da229c8bfa8b6bce9.tar.gz
gn: gem5: Prepare for test suite.
-rw-r--r--gn/packages/virtualization.scm11
1 files changed, 7 insertions, 4 deletions
diff --git a/gn/packages/virtualization.scm b/gn/packages/virtualization.scm
index 5c08f11..9e7efd7 100644
--- a/gn/packages/virtualization.scm
+++ b/gn/packages/virtualization.scm
@@ -48,7 +48,6 @@
     (arguments
      `(#:scons-flags
        (list "--verbose")
-       #:tests? #f      ; TODO: How to run test suite?
        #:build-targets '("build/ARM/gem5.opt"
                          "build/MIPS/gem5.opt"
                          "build/NULL/gem5.opt"
@@ -82,10 +81,14 @@
                   all)))
              (substitute* "ext/libelf/native-elf-format"
                (("cc") ,(cc-for-target)))))
+         ;; This uses the cached results from the previous 'build phase.
+         ;; Move to after 'install and delete build dir first?
          (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
+           (lambda* (#:key tests? #:allow-other-keys #:rest args)
              (when tests?
-               (invoke "python3" "tests/run.py"))))
+               (apply (assoc-ref %standard-phases 'build)
+                      #:build-targets '("build/NULL/unittests.opt")
+                      args))))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -145,7 +148,7 @@ processor microarchitecture.")
     (name "gem5-riscv")
     (arguments
      (substitute-keyword-arguments (package-arguments gem5)
-       ((#:build-targets _)
+       ((#:build-targets _ '())
         `(list "build/RISCV/gem5.opt"))
        ((#:phases phases)
         `(modify-phases ,phases