ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-04 02:19:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mariadb: Only run the main test suite to avoid flaky tests.

Browse source 
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.
This commit is contained in:
Maxim Cournoyer 2021-10-20 22:24:09 -04:00
parent 12b9810ede
commit fdae245a75
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/databases.scm
View file

@ -775,8 +775,7 @@ (define-public mariadb
(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
@ -862,8 +861,7 @@ (define-public mariadb
"${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
@ -912,8 +910,7 @@ (define-public mariadb
(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)
@ -924,14 +921,14 @@ (define-public mariadb
(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?
@ -942,8 +939,7 @@ (define-public mariadb
;; 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)
@ -988,9 +984,7 @@ (define-public mariadb
(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)))