me/guix
Archived
1
0
Fork 0
Code Activity

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 @@ Language.")
(unless (string-suffix? "CMakeLists.txt" file) (unless (string-suffix? "CMakeLists.txt" file)
(delete-file file))) (delete-file file)))
(append (find-files "extra/wolfssl") (append (find-files "extra/wolfssl")
(find-files "zlib"))) (find-files "zlib")))))))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(outputs '("out" "lib" "dev")) (outputs '("out" "lib" "dev"))
(arguments (arguments
@ -862,8 +861,7 @@ Language.")
"${INSTALL_INCLUDEDIR}")) "${INSTALL_INCLUDEDIR}"))
(substitute* "cmake/mariadb_connector_c.cmake" (substitute* "cmake/mariadb_connector_c.cmake"
(("\\\\\\$\\{CMAKE_INSTALL_PREFIX\\}/\\$\\{INSTALL_BINDIR\\}") (("\\\\\\$\\{CMAKE_INSTALL_PREFIX\\}/\\$\\{INSTALL_BINDIR\\}")
"${INSTALL_BINDIR}")) "${INSTALL_BINDIR}"))))
#t))
(add-after 'unpack 'adjust-tests (add-after 'unpack 'adjust-tests
(lambda _ (lambda _
(let ((disabled-tests (let ((disabled-tests
@ -912,8 +910,7 @@ Language.")
(substitute* "mysql-test/mysql-test-run.pl" (substitute* "mysql-test/mysql-test-run.pl"
(("/bin/ls") (which "ls")) (("/bin/ls") (which "ls"))
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh"))))))
#t)))
(add-before 'configure 'disable-plugins (add-before 'configure 'disable-plugins
(lambda _ (lambda _
(let ((disable-plugin (lambda (name) (let ((disable-plugin (lambda (name)
@ -924,14 +921,14 @@ Language.")
(format port "\n"))))) (format port "\n")))))
(disabled-plugins '(;; XXX: Causes a test failure. (disabled-plugins '(;; XXX: Causes a test failure.
"disks"))) "disks")))
(for-each disable-plugin disabled-plugins) (for-each disable-plugin disabled-plugins))))
#t)))
(replace 'check (replace 'check
(lambda* (#:key (tests? #t) parallel-tests? #:allow-other-keys) (lambda* (#:key (tests? #t) parallel-tests? #:allow-other-keys)
(if tests? (if tests?
(with-directory-excursion "mysql-test" (with-directory-excursion "mysql-test"
(invoke "./mtr" "--verbose" (invoke "./mtr" "--verbose"
"--retry=3" "--retry=3"
"--suite=main"
"--testcase-timeout=40" "--testcase-timeout=40"
"--suite-timeout=600" "--suite-timeout=600"
"--parallel" (number->string (if parallel-tests? "--parallel" (number->string (if parallel-tests?
@ -942,8 +939,7 @@ Language.")
;; failures even on powerful hardware. ;; failures even on powerful hardware.
"--skip-rpl" "--skip-rpl"
"--skip-test-list=unstable-tests")) "--skip-test-list=unstable-tests"))
(format #t "test suite not run~%")) (format #t "test suite not run~%"))))
#t))
(add-after (add-after
'install 'post-install 'install 'post-install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -988,9 +984,7 @@ Language.")
(substitute* (list (string-append dev "/bin/mysql_config") (substitute* (list (string-append dev "/bin/mysql_config")
(string-append dev "/lib/pkgconfig/mariadb.pc")) (string-append dev "/lib/pkgconfig/mariadb.pc"))
(("-lssl -lcrypto" all) (("-lssl -lcrypto" all)
(string-append "-L" openssl "/lib " all))) (string-append "-L" openssl "/lib " all)))))))))
#t))))))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
("perl" ,perl))) ("perl" ,perl)))