about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPjotr Prins2023-06-18 15:42:05 +0200
committerPjotr Prins2023-06-18 15:42:05 +0200
commit81885df75204d3877cc34d856fa99ba826366d6f (patch)
tree1e8ded5009774bb41f73dca4a305d00ebefe56a9
parentc809a9235f3d37875e8ae9d3b21c3f07da94096a (diff)
downloadpangemma-81885df75204d3877cc34d856fa99ba826366d6f.tar.gz
Start using catch2 testing system
-rw-r--r--guix.scm4
-rw-r--r--test/src/unittests-main.cpp2
-rw-r--r--test/src/unittests-math.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/guix.scm b/guix.scm
index 0767b91..e64ff98 100644
--- a/guix.scm
+++ b/guix.scm
@@ -48,7 +48,7 @@
     (source (local-file %source-dir #:recursive? #t))
     (build-system gnu-build-system)
     (inputs `(
-              ("catch2" ,catch2)
+              ("catch" ,catch2)
               ("gdb" ,gdb)
               ("gsl" ,gsl)
               ;; ("shunit2" ,shunit2) ;; comes with gemma
@@ -74,7 +74,7 @@
                                (lambda* (#:key outputs #:allow-other-keys)
                                  (let ((out (assoc-ref outputs "out")))
                                    (install-file "bin/gemma" (string-append out "/bin"))))))
-       #:tests? #f
+       #:tests? #t
        #:parallel-tests? #f))
     (home-page "https://github.com/genetics-statistics")
     (synopsis "Tool for genome-wide efficient mixed model association")
diff --git a/test/src/unittests-main.cpp b/test/src/unittests-main.cpp
index 3c3c6f2..afeca98 100644
--- a/test/src/unittests-main.cpp
+++ b/test/src/unittests-main.cpp
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
-#include <catch.hpp>
+#include <catch2/catch.hpp>
diff --git a/test/src/unittests-math.cpp b/test/src/unittests-math.cpp
index 4872e9a..25ebec3 100644
--- a/test/src/unittests-math.cpp
+++ b/test/src/unittests-math.cpp
@@ -1,4 +1,4 @@
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <iostream>
 #include <fenv.h>