diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-05-29 00:44:23 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-05-29 21:15:39 -0400 |
| commit | a05c130435d559bcea8dd213294ae7e8159b1d51 (patch) | |
| tree | 9b78d7f6641915fe1772af0653931a86dc322949 /gnu/packages/jami.scm | |
| parent | 9ed847f8289b4a6f1855c0aa0cba9c94e09a9dc8 (diff) | |
| download | guix-patches-a05c130435d559bcea8dd213294ae7e8159b1d51.tar guix-patches-a05c130435d559bcea8dd213294ae7e8159b1d51.tar.gz | |
gnu: jami: Work toward reinstating functional tests.
* gnu/packages/patches/jami-enable-testing.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/jami.scm (jami) [source]: Apply it.
[phases] <check>: Use 'ctest' to run tests. Update comment explaining why the
QML test suite is disabled.
Change-Id: I5c9333a3b5064ecec9a2dd4fe13ae597d5354b7c
Diffstat (limited to 'gnu/packages/jami.scm')
| -rw-r--r-- | gnu/packages/jami.scm | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index cb5995cc14..6f42b1ef67 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -232,6 +232,7 @@ QSortFilterProxyModel conveniently exposed for QML.") (base32 "1wqi50n80khyngj48brc8wg3m6jq471h9gm62yxpj4f8z5j81ncd")) (patches (search-patches + "jami-enable-testing.patch" "jami-libjami-headers-search.patch" "jami-qwindowkit.patch" "jami-skip-tests-requiring-internet.patch" @@ -276,22 +277,28 @@ QSortFilterProxyModel conveniently exposed for QML.") ;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1504). (setenv "XDG_SESSION_TYPE" "x11"))) (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) (when tests? (setenv "QT_QPA_PLATFORM" "offscreen") (setenv "QT_QUICK_BACKEND" "software") ;; The tests require a writable HOME. (setenv "HOME" "/tmp") - (display "Running unit tests...\n") - (invoke "tests/unit_tests") + (let ((ctest-args + (list "-V" "--output-on-failure" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1")))) - ;; The qml_tests suite is not run, as it currently exits with - ;; an unclear status of 1 (see: - ;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1605). - ;; (display "Running functional tests...\n") - ;; (invoke "tests/qml_tests") - )))))) + (display "Running unit tests...\n") + (apply invoke "ctest" "-R" "Unit_Tests" ctest-args) + + ;; The QML test suite is currently disabled as it segfaults + ;; (see: + ;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1631). + ;; (display "Running functional tests...\n") (apply invoke + ;; "ctest" "-R" "Qml_Tests" ctest-args) + ))))))) (native-inputs (list googletest pkg-config |