gnu: kwindowsystem: Fix some test-cases (test-suite still disabled).
Make five tests pass, three are still failing – thus the test-suite is still disabled. This commit's aim is to retain the progress. * gnu/packages/kde-frameworks.scm (kwindowsystem)[native-inputs]: Add dbus. [arguments]<#:test?>: Change comment. <#:phases>: Replace phase `check` by new one befind 'install'.
This commit is contained in:
		
							parent
							
								
									3406d0b3a9
								
							
						
					
					
						commit
						ed4a3ec68c
					
				
					 1 changed files with 26 additions and 1 deletions
				
			
		| 
						 | 
					@ -1013,6 +1013,7 @@ configuration pages, message boxes, and password requests.")
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("extra-cmake-modules" ,extra-cmake-modules)
 | 
					     `(("extra-cmake-modules" ,extra-cmake-modules)
 | 
				
			||||||
       ("pkg-config" ,pkg-config)
 | 
					       ("pkg-config" ,pkg-config)
 | 
				
			||||||
 | 
					       ("dbus" ,dbus) ; for the tests
 | 
				
			||||||
       ("qttools" ,qttools)
 | 
					       ("qttools" ,qttools)
 | 
				
			||||||
       ("xorg-server" ,xorg-server))) ; for the tests
 | 
					       ("xorg-server" ,xorg-server))) ; for the tests
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
| 
						 | 
					@ -1021,7 +1022,31 @@ configuration pages, message boxes, and password requests.")
 | 
				
			||||||
       ("qtx11extras" ,qtx11extras)
 | 
					       ("qtx11extras" ,qtx11extras)
 | 
				
			||||||
       ("xcb-utils-keysyms" ,xcb-util-keysyms)))
 | 
					       ("xcb-utils-keysyms" ,xcb-util-keysyms)))
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:tests? #f)) ; FIXME: 8/10 tests fail.
 | 
					     `(#:tests? #f ; FIXME: 3/12 tests fail.
 | 
				
			||||||
 | 
					       #:phases
 | 
				
			||||||
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
 | 
					         (delete 'check)
 | 
				
			||||||
 | 
					         (add-after 'install 'check
 | 
				
			||||||
 | 
					           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
 | 
				
			||||||
 | 
					             ;; TODO: Simplify and use "common" phases when test-suite passes
 | 
				
			||||||
 | 
					             (if tests?
 | 
				
			||||||
 | 
					                 (begin
 | 
				
			||||||
 | 
					                   (let ((out (assoc-ref outputs "out")))
 | 
				
			||||||
 | 
					                     (setenv "QT_PLUGIN_PATH"
 | 
				
			||||||
 | 
					                             (string-append out "/lib/plugins:"
 | 
				
			||||||
 | 
					                                            (getenv "QT_PLUGIN_PATH"))))
 | 
				
			||||||
 | 
					                   ;; The test suite requires a running X server, setting
 | 
				
			||||||
 | 
					                   ;; QT_QPA_PLATFORM=offscreen does not suffice and even make
 | 
				
			||||||
 | 
					                   ;; some tests fail.
 | 
				
			||||||
 | 
					                   (system (string-append (assoc-ref inputs "xorg-server")
 | 
				
			||||||
 | 
					                                          "/bin/Xvfb :1 -screen 0 640x480x24 &"))
 | 
				
			||||||
 | 
					                   (setenv "DISPLAY" ":1")
 | 
				
			||||||
 | 
					                   (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
 | 
				
			||||||
 | 
					                   (setenv "DBUS_FATAL_WARNINGS" "0")
 | 
				
			||||||
 | 
					                   (zero? (system* "dbus-launch" "ctest" ".")))
 | 
				
			||||||
 | 
					                 (begin
 | 
				
			||||||
 | 
					                   (format #t "test suite not run~%")
 | 
				
			||||||
 | 
					                   #t)))))))
 | 
				
			||||||
    (home-page "https://community.kde.org/Frameworks")
 | 
					    (home-page "https://community.kde.org/Frameworks")
 | 
				
			||||||
    (synopsis "KDE access to the windowing system")
 | 
					    (synopsis "KDE access to the windowing system")
 | 
				
			||||||
    (description "KWindowSystem provides information about and allows
 | 
					    (description "KWindowSystem provides information about and allows
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue