gnu: php: Combine skipped tests per arch code.

* gnu/packages/php.scm (php)[arguments]: In 'prepare-tests phase combine
the code used for skipping a few tests per architecture into one
grouping.

Change-Id: I275099dcc2b1f003ec48a72b910d4cfd579d9628
This commit is contained in:
Efraim Flashner 2023-11-27 11:59:36 +02:00
parent 0bef0ac46e
commit a8df11fa6c
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351

View file

@ -175,56 +175,43 @@ (define-public php
(substitute* "ext/standard/tests/streams/bug60602.phpt" (substitute* "ext/standard/tests/streams/bug60602.phpt"
(("'ls'") (string-append "'" (which "ls") "'"))) (("'ls'") (string-append "'" (which "ls") "'")))
,@(if (target-arm32?) ;; Drop tests known to fail on different architectures:
;; Drop tests known to fail on armhf. (for-each delete-file
'((for-each delete-file ,(cond
(list ((target-arm32?)
"ext/calendar/tests/unixtojd_error1.phpt" `(list "ext/calendar/tests/unixtojd_error1.phpt"
"ext/opcache/tests/preload_006.phpt" "ext/opcache/tests/preload_006.phpt"
"ext/opcache/tests/preload_011.phpt" "ext/opcache/tests/preload_011.phpt"
;; arm can be a lot slower, so a time-related test fails ;; arm can be a lot slower, so a time-related test fails
"ext/fileinfo/tests/cve-2014-3538-nojit.phpt" "ext/fileinfo/tests/cve-2014-3538-nojit.phpt"
"ext/pcntl/tests/pcntl_unshare_01.phpt" "ext/pcntl/tests/pcntl_unshare_01.phpt"
"ext/pcre/tests/bug76514.phpt" "ext/pcre/tests/bug76514.phpt"
"ext/pcre/tests/preg_match_error3.phpt" "ext/pcre/tests/preg_match_error3.phpt"
"ext/pcre/tests/cache_limit.phpt" "ext/pcre/tests/cache_limit.phpt"
"ext/sockets/tests/socket_getopt.phpt" "ext/sockets/tests/socket_getopt.phpt"
"ext/sockets/tests/socket_sendrecvmsg_error.phpt" "ext/sockets/tests/socket_sendrecvmsg_error.phpt"
"ext/standard/tests/general_functions/var_export-locale.phpt" "ext/standard/tests/general_functions/var_export-locale.phpt"
"ext/standard/tests/general_functions/var_export_basic1.phpt" "ext/standard/tests/general_functions/var_export_basic1.phpt"
"ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt" "ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt"
"ext/intl/tests/timezone_getOffset_error.phpt" "ext/intl/tests/timezone_getOffset_error.phpt"
"sapi/cli/tests/cli_process_title_unix.phpt" "sapi/cli/tests/cli_process_title_unix.phpt"
"sapi/cli/tests/upload_2G.phpt" "sapi/cli/tests/upload_2G.phpt"
"Zend/tests/concat_003.phpt"))) "Zend/tests/concat_003.phpt"))
'()) ((target-x86-32?)
`(list "ext/dba/tests/dba_gdbm.phpt"))
,@(if (target-x86-32?) ((target-ppc64le?)
;; Drop tests known to fail on i686. `(list
'((for-each delete-file ;; phpdbg watchpoints don't work.
(list ;; Bug tracked upstream at:
"ext/dba/tests/dba_gdbm.phpt"))) ;; https://bugs.php.net/bug.php?id=81408
'()) "sapi/phpdbg/tests/watch_001.phpt"
"sapi/phpdbg/tests/watch_003.phpt"
,@(if (target-ppc64le?) "sapi/phpdbg/tests/watch_004.phpt"
;; Drop tests known to fail on powerpc64le. "sapi/phpdbg/tests/watch_005.phpt"
'((for-each delete-file "sapi/phpdbg/tests/watch_006.phpt"))
(list ((target-riscv64?)
;; phpdbg watchpoints don't work. `(list "sapi/cli/tests/upload_2G.phpt"))
;; Bug tracked upstream at: (else `'())))
;; https://bugs.php.net/bug.php?id=81408
"sapi/phpdbg/tests/watch_001.phpt"
"sapi/phpdbg/tests/watch_003.phpt"
"sapi/phpdbg/tests/watch_004.phpt"
"sapi/phpdbg/tests/watch_005.phpt"
"sapi/phpdbg/tests/watch_006.phpt")))
'())
,@(if (target-riscv64?)
;; Drop tests known to fail on riscv64.
'((for-each delete-file
(list "sapi/cli/tests/upload_2G.phpt")))
'())
;; Drop tests that are known to fail. ;; Drop tests that are known to fail.
(for-each delete-file (for-each delete-file