[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
145/149: gnu: mariadb: Only run the main test suite to avoid flaky tests
From: |
guix-commits |
Subject: |
145/149: gnu: mariadb: Only run the main test suite to avoid flaky tests. |
Date: |
Tue, 26 Oct 2021 23:52:45 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit d0f506fe3143f359a5a71e7c22f75c5f0f6c51e7
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Oct 20 22:24:09 2021 -0400
gnu: mariadb: Only run the main test suite to avoid flaky tests.
Tests from the perfschema test suite has a high failure rate. Upstream only
tests the main test suite in their CI, so don't try to outdo them.
* gnu/packages/databases.scm (mariadb): Delete trailing #t.
[phases]{check}: Only run the main test suite.
---
gnu/packages/databases.scm | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 1f19396..faf8903 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -775,8 +775,7 @@ Language.")
(unless (string-suffix? "CMakeLists.txt" file)
(delete-file file)))
(append (find-files "extra/wolfssl")
- (find-files "zlib")))
- #t))))
+ (find-files "zlib")))))))
(build-system cmake-build-system)
(outputs '("out" "lib" "dev"))
(arguments
@@ -858,8 +857,7 @@ Language.")
"${INSTALL_INCLUDEDIR}"))
(substitute* "cmake/mariadb_connector_c.cmake"
(("\\\\\\$\\{CMAKE_INSTALL_PREFIX\\}/\\$\\{INSTALL_BINDIR\\}")
- "${INSTALL_BINDIR}"))
- #t))
+ "${INSTALL_BINDIR}"))))
(add-after 'unpack 'adjust-tests
(lambda _
(let ((disabled-tests
@@ -908,8 +906,7 @@ Language.")
(substitute* "mysql-test/mysql-test-run.pl"
(("/bin/ls") (which "ls"))
- (("/bin/sh") (which "sh")))
- #t)))
+ (("/bin/sh") (which "sh"))))))
(add-before 'configure 'disable-plugins
(lambda _
(let ((disable-plugin (lambda (name)
@@ -920,14 +917,14 @@ Language.")
(format port "\n")))))
(disabled-plugins '(;; XXX: Causes a test failure.
"disks")))
- (for-each disable-plugin disabled-plugins)
- #t)))
+ (for-each disable-plugin disabled-plugins))))
(replace 'check
(lambda* (#:key (tests? #t) parallel-tests? #:allow-other-keys)
(if tests?
(with-directory-excursion "mysql-test"
(invoke "./mtr" "--verbose"
"--retry=3"
+ "--suite=main"
"--testcase-timeout=40"
"--suite-timeout=600"
"--parallel" (number->string (if parallel-tests?
@@ -938,8 +935,7 @@ Language.")
;; failures even on powerful hardware.
"--skip-rpl"
"--skip-test-list=unstable-tests"))
- (format #t "test suite not run~%"))
- #t))
+ (format #t "test suite not run~%"))))
(add-after
'install 'post-install
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -984,9 +980,7 @@ Language.")
(substitute* (list (string-append dev "/bin/mysql_config")
(string-append dev
"/lib/pkgconfig/mariadb.pc"))
(("-lssl -lcrypto" all)
- (string-append "-L" openssl "/lib " all)))
-
- #t))))))
+ (string-append "-L" openssl "/lib " all)))))))))
(native-inputs
`(("bison" ,bison)
("perl" ,perl)))
- 124/149: gnu: libthai: Make datrie a normal native-input., (continued)
- 124/149: gnu: libthai: Make datrie a normal native-input., guix-commits, 2021/10/26
- 125/149: gnu: glib: Update to 2.70, specify a bindir prefix and hide package., guix-commits, 2021/10/26
- 126/149: gnu: glib-networking: Update to 2.70.rc., guix-commits, 2021/10/26
- 127/149: gnu: vala: Update to 0.54.2., guix-commits, 2021/10/26
- 130/149: gnu: webkitgtk: Update to 2.34.0., guix-commits, 2021/10/26
- 133/149: gnu: python-flit: Update to 3.3.0., guix-commits, 2021/10/26
- 131/149: gnu: pulseaudio: Add doxygen to fix build., guix-commits, 2021/10/26
- 134/149: gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper., guix-commits, 2021/10/26
- 140/149: gnu: gtk: Replace gdk-pixbuf+svg by librsvg., guix-commits, 2021/10/26
- 143/149: gnu: elogind: Update to 246.10., guix-commits, 2021/10/26
- 145/149: gnu: mariadb: Only run the main test suite to avoid flaky tests.,
guix-commits <=
- 146/149: gnu: nspr: Normalize inputs., guix-commits, 2021/10/26
- 147/149: gnu: nss: Update to 3.71., guix-commits, 2021/10/26