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:
		
							parent
							
								
									0bef0ac46e
								
							
						
					
					
						commit
						a8df11fa6c
					
				
					 1 changed files with 37 additions and 50 deletions
				
			
		| 
						 | 
					@ -175,11 +175,11 @@
 | 
				
			||||||
             (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
 | 
				
			||||||
| 
						 | 
					@ -196,20 +196,11 @@
 | 
				
			||||||
                        "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
 | 
					 | 
				
			||||||
                               (list
 | 
					 | 
				
			||||||
                                "ext/dba/tests/dba_gdbm.phpt")))
 | 
					 | 
				
			||||||
                   '())
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
             ,@(if (target-ppc64le?)
 | 
					 | 
				
			||||||
                   ;; Drop tests known to fail on powerpc64le.
 | 
					 | 
				
			||||||
                   '((for-each delete-file
 | 
					 | 
				
			||||||
                               (list
 | 
					 | 
				
			||||||
                    ;; phpdbg watchpoints don't work.
 | 
					                    ;; phpdbg watchpoints don't work.
 | 
				
			||||||
                    ;; Bug tracked upstream at:
 | 
					                    ;; Bug tracked upstream at:
 | 
				
			||||||
                    ;; https://bugs.php.net/bug.php?id=81408
 | 
					                    ;; https://bugs.php.net/bug.php?id=81408
 | 
				
			||||||
| 
						 | 
					@ -217,14 +208,10 @@
 | 
				
			||||||
                    "sapi/phpdbg/tests/watch_003.phpt"
 | 
					                    "sapi/phpdbg/tests/watch_003.phpt"
 | 
				
			||||||
                    "sapi/phpdbg/tests/watch_004.phpt"
 | 
					                    "sapi/phpdbg/tests/watch_004.phpt"
 | 
				
			||||||
                    "sapi/phpdbg/tests/watch_005.phpt"
 | 
					                    "sapi/phpdbg/tests/watch_005.phpt"
 | 
				
			||||||
                                "sapi/phpdbg/tests/watch_006.phpt")))
 | 
					                    "sapi/phpdbg/tests/watch_006.phpt"))
 | 
				
			||||||
                   '())
 | 
					                ((target-riscv64?)
 | 
				
			||||||
 | 
					                 `(list "sapi/cli/tests/upload_2G.phpt"))
 | 
				
			||||||
             ,@(if (target-riscv64?)
 | 
					                (else `'())))
 | 
				
			||||||
                   ;; 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
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue