[Python-modules-commits] r13417 - in packages/pyside/trunk/debian (3 files)

[odyx-guest at users.alioth.debian.org]

    Date: Monday, June 14, 2010 @ 08:37:16
  Author: odyx-guest
Revision: 13417

* Blacklist some failing tests (reported upstream).
* Don't run the tests for the debug flavour (they fail).  

Modified:
  packages/pyside/trunk/debian/changelog
  packages/pyside/trunk/debian/patches/fixTests.patch
  packages/pyside/trunk/debian/rules

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2010-06-13 20:58:41 UTC (rev 13416)
+++ packages/pyside/trunk/debian/changelog	2010-06-14 08:37:16 UTC (rev 13417)
@@ -11,10 +11,12 @@
       u_fixLinking_4326368.patch
       u_fixtestQtWebkitTest_17d9eed.patch
     × Refresh the others
-  
+
+  * Blacklist some failing tests (reported upstream).
+  * Don't run the tests for the debug flavour (they fail).  
   * Override lintian warnings for the -dbg package.
 
- -- Didier Raboud <didier at raboud.com>  Mon, 07 Jun 2010 11:39:35 +0200
+ -- Didier Raboud <didier at raboud.com>  Mon, 14 Jun 2010 10:09:54 +0200
 
 pyside (0.3.1-2) unstable; urgency=low
 

Modified: packages/pyside/trunk/debian/patches/fixTests.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixTests.patch	2010-06-13 20:58:41 UTC (rev 13416)
+++ packages/pyside/trunk/debian/patches/fixTests.patch	2010-06-14 08:37:16 UTC (rev 13417)
@@ -8,19 +8,29 @@
 
 Index: pyside/tests/CMakeLists.txt
 ===================================================================
---- pyside.orig/tests/CMakeLists.txt	2010-06-06 19:13:22.000000000 +0200
-+++ pyside/tests/CMakeLists.txt	2010-06-06 19:16:19.000000000 +0200
-@@ -1,10 +1,17 @@
+--- pyside.orig/tests/CMakeLists.txt	2010-06-06 19:20:55.000000000 +0200
++++ pyside/tests/CMakeLists.txt	2010-06-14 09:55:11.000000000 +0200
+@@ -1,10 +1,27 @@
  
  file(GLOB TEST_FILES */*_test.py)
  
 -set(test_blacklist )
 +# Debian patch
-+# blacklist non-compiled tests: qtmaemo5*
-+set(test_blacklist qtmaemo5_qmaemo5import)
-+# blacklist mandelbug tests:
-+# - qtnetwork_udpsocket (upstream: #230)
-+set(test_dontrun_list qtnetwork_udpsocket )
++# blacklist non-compiled tests
++#        138 - qtmaemo5_pickselector
++#        139 - qtmaemo5_qmaemo5import
++#        144 - qtopengl_qglbuffer
++#        145 - qtdeclarative_qdeclarativenetwork
++#        146 - qtdeclarative_qdeclarativeview
++set(test_blacklist qtmaemo5_pickselector qtmaemo5_qmaemo5import qtopengl_qglbuffer qtdeclarative_qdeclarativenetwork qtdeclarative_qdeclarativeview)
++
++# Don't run other bugs:
++#         74 - qtmultimedia_audio
++# python2.6: pcm_params.c:2348: sndrv_pcm_hw_params: Assertion `err >= 0' failed.
++# Aborted
++#         83 - qtgui_qwidget
++# Segmentation fault
++set(test_dontrun_list qtmultimedia_audio qtgui_qwidget)
  
  foreach(test_file ${TEST_FILES})
      string(REGEX MATCH "/([^/]+)//?([^/]+)_test.py" test_name ${test_file} )
@@ -29,7 +39,7 @@
      list(FIND test_blacklist ${CMAKE_MATCH_1}_${CMAKE_MATCH_2} expect_fail)
      add_test(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} sh
               ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
-@@ -12,10 +19,11 @@
+@@ -12,10 +29,11 @@
               "${CMAKE_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}/util"
               ${PYTHON_EXECUTABLE}
               ${test_file})

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2010-06-13 20:58:41 UTC (rev 13416)
+++ packages/pyside/trunk/debian/rules	2010-06-14 08:37:16 UTC (rev 13417)
@@ -62,8 +62,9 @@
 override_dh_auto_test: $(PYVERSIONS:%=override_dh_auto_test_dbg-%) $(PYVERSIONS:%=override_dh_auto_test-%)
 
 override_dh_auto_test_dbg-%:
+	# Don't run tests for the -dbg version, they all fail (upstream bug: #217)
 	# Run tests in fake X Server (they all fail)
-	- xvfb-run -a -s -noreset dh_auto_test --builddirectory=build-$*-dbg
+	# - xvfb-run -a -s -noreset dh_auto_test --builddirectory=build-$*-dbg
 
 override_dh_auto_test-%:
 	# Run tests in fake X Server