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

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

    Date: Friday, June 18, 2010 @ 07:23:34
  Author: odyx-guest
Revision: 13463

* Run all tests but don't make them critical.
  - Update fixTests.patch to allow all tests.

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-17 23:32:20 UTC (rev 13462)
+++ packages/pyside/trunk/debian/changelog	2010-06-18 07:23:34 UTC (rev 13463)
@@ -1,8 +1,9 @@
 pyside (0.3.2-2) unstable; urgency=low
 
-  * Blacklist qtnetwork_udpsocket again (fails on the buildds).
+  * Run all tests but don't make them critical.
+    - Update fixTests.patch to allow all tests.
 
- -- Didier Raboud <didier at raboud.com>  Thu, 17 Jun 2010 14:59:53 +0200
+ -- Didier Raboud <didier at raboud.com>  Fri, 18 Jun 2010 09:22:05 +0200
 
 pyside (0.3.2-1) unstable; urgency=low
 

Modified: packages/pyside/trunk/debian/patches/fixTests.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixTests.patch	2010-06-17 23:32:20 UTC (rev 13462)
+++ packages/pyside/trunk/debian/patches/fixTests.patch	2010-06-18 07:23:34 UTC (rev 13463)
@@ -9,8 +9,8 @@
 Index: pyside/tests/CMakeLists.txt
 ===================================================================
 --- pyside.orig/tests/CMakeLists.txt	2010-06-17 15:07:01.000000000 +0200
-+++ pyside/tests/CMakeLists.txt	2010-06-17 15:07:21.000000000 +0200
-@@ -1,10 +1,29 @@
++++ pyside/tests/CMakeLists.txt	2010-06-18 09:21:56.000000000 +0200
+@@ -1,10 +1,31 @@
  
  file(GLOB TEST_FILES */*_test.py)
  
@@ -22,7 +22,8 @@
 +#        144 - qtopengl_qglbuffer
 +#        145 - qtdeclarative_qdeclarativenetwork
 +#        146 - qtdeclarative_qdeclarativeview
-+set(test_blacklist qtmaemo5_pickselector qtmaemo5_qmaemo5import qtopengl_qglbuffer qtdeclarative_qdeclarativenetwork qtdeclarative_qdeclarativeview)
++#set(test_blacklist qtmaemo5_pickselector qtmaemo5_qmaemo5import qtopengl_qglbuffer qtdeclarative_qdeclarativenetwork qtdeclarative_qdeclarativeview)
++set(test_blacklist "")
 +
 +# Don't run other bugs:
 +#         74 - qtmultimedia_audio (upstream: #240)
@@ -32,7 +33,8 @@
 +# Segmentation fault
 +#        122 - qtnetwork_udpsocket (upstream: #230)
 +# AttributeError
-+set(test_dontrun_list qtmultimedia_audio qtgui_qwidget qtnetwork_udpsocket)
++# set(test_dontrun_list qtmultimedia_audio qtgui_qwidget qtnetwork_udpsocket)
++set(test_dontrun_list "")
  
  foreach(test_file ${TEST_FILES})
      string(REGEX MATCH "/([^/]+)//?([^/]+)_test.py" test_name ${test_file} )
@@ -41,7 +43,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 +31,11 @@
+@@ -12,10 +33,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-17 23:32:20 UTC (rev 13462)
+++ packages/pyside/trunk/debian/rules	2010-06-18 07:23:34 UTC (rev 13463)
@@ -62,13 +62,12 @@
 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
-	xvfb-run -a -s -noreset dh_auto_test --builddirectory=build-$*
+	# Run tests in fake X Server in a non-blocking way
+	- xvfb-run -a -s -noreset dh_auto_test --builddirectory=build-$*
 
 #### CLEAN ####
 override_dh_auto_clean: