From 81885df75204d3877cc34d856fa99ba826366d6f Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Sun, 18 Jun 2023 15:42:05 +0200 Subject: [PATCH] Start using catch2 testing system --- guix.scm | 4 ++-- test/src/unittests-main.cpp | 2 +- test/src/unittests-math.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guix.scm b/guix.scm index 0767b913..e64ff983 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 3c3c6f2f..afeca98a 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 +#include diff --git a/test/src/unittests-math.cpp b/test/src/unittests-math.cpp index 4872e9ae..25ebec32 100644 --- a/test/src/unittests-math.cpp +++ b/test/src/unittests-math.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include