[Python-modules-commits] r13113 - in packages/pyside/trunk/debian (2 files)

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

    Date: Thursday, May 27, 2010 @ 20:56:16
  Author: odyx-guest
Revision: 13113

Blacklist qtnetwork_udpsocket that fails on the buildds

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

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2010-05-27 20:47:47 UTC (rev 13112)
+++ packages/pyside/trunk/debian/changelog	2010-05-27 20:56:16 UTC (rev 13113)
@@ -1,13 +1,16 @@
 pyside (0.3.1-2) UNRELEASED; urgency=low
 
-  * Import patches that got merged upstream:
+  * Testsuite:
+    - Blacklist qtnetwork_udpsocket that fails on the buildds
+
+  * Patches: import those hat got merged upstream:
     - fix_Linking.patch
        -> u_fixLinking_4326368.patch
     - fixDebugPostfix.patch
        -> u_fixConvenienceSymlinks_792456c.patch
        -> u_fixDebugPostfix_d9b1898.patch
 
- -- Didier Raboud <didier at raboud.com>  Thu, 27 May 2010 22:46:03 +0200
+ -- Didier Raboud <didier at raboud.com>  Thu, 27 May 2010 22:55:38 +0200
 
 pyside (0.3.1-1) UNRELEASED; urgency=low
 

Modified: packages/pyside/trunk/debian/patches/fixTests.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixTests.patch	2010-05-27 20:47:47 UTC (rev 13112)
+++ packages/pyside/trunk/debian/patches/fixTests.patch	2010-05-27 20:56:16 UTC (rev 13113)
@@ -8,9 +8,9 @@
 
 Index: pyside/tests/CMakeLists.txt
 ===================================================================
---- pyside.orig/tests/CMakeLists.txt	2010-05-11 15:59:46.000000000 +0200
-+++ pyside/tests/CMakeLists.txt	2010-05-12 14:44:00.000000000 +0200
-@@ -1,21 +1,28 @@
+--- pyside.orig/tests/CMakeLists.txt	2010-05-27 22:44:39.000000000 +0200
++++ pyside/tests/CMakeLists.txt	2010-05-27 22:54:15.000000000 +0200
+@@ -1,21 +1,30 @@
  
  file(GLOB TEST_FILES */*_test.py)
  
@@ -18,8 +18,10 @@
 +# Debian patch
 +# blacklist non-compiled tests: qtmaemo5*
 +set(test_blacklist qtmaemo5_qmaemo5import)
-+# blacklist mandelbug tests: qtwebkit_webpage (upstream: #218)
-+set(test_dontrun_list qtwebkit_webpage)
++# blacklist mandelbug tests:
++# - qtwebkit_webpage (upstream: #218)
++# - qtnetwork_udpsocket (upstream: #230)
++set(test_dontrun_list qtwebkit_webpage qtnetwork_udpsocket )
  
  foreach(test_file ${TEST_FILES})
      string(REGEX MATCH "/([^/]+)//?([^/]+)_test.py" test_name ${test_file} )