211 files changed, 241 insertions, 79 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ada5b7a..d87414f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,22 +1,44 @@
+set(PYSIDE_TIMEOUT 5)
 
-file(GLOB TEST_FILES */*_test.py)
+macro(TEST_QT_MODULE var name)
+  if(NOT DISABLE_${name} AND ${var})
+      add_subdirectory(${name})
+  endif()
+endmacro(TEST_QT_MODULE)
 
-set(test_blacklist )
+macro(PYSIDE_TEST)
+    set(TEST_NAME ${ARGV0})
+    if (${ARGC} EQUAL 1)
+        set(EXPECT_TO_FAIL 0)
+    elseif(${ARGC} EQUAL 2)
+        set(EXPECT_TO_FAIL ${ARGV1})
+    else()
+        message(WARNING "Ivalid call of macro PYSIDE_TEST")
+    endif()
+    set(TEST_CMD ${CMAKE_SOURCE_DIR}/tests/run_test.sh  ${CMAKE_BINARY_DIR} "${CMAKE_BINARY_DIR}:${CMAKE_SOURCE_DIR}/tests/util" ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}")
+    add_test(${TEST_NAME} ${TEST_CMD})
+    set_tests_properties(${TEST_NAME} PROPERTIES
+                         TIMEOUT ${PYSIDE_TIMEOUT}
+                         WILL_FAIL ${EXPECT_TO_FAIL})
+endmacro(PYSIDE_TEST)
 
-foreach(test_file ${TEST_FILES})
-    string(REGEX MATCH "/([^/]+)//?([^/]+)_test.py" test_name ${test_file} )
-    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
-             "${pysidebase_BINARY_DIR}:${libpyside_BINARY_DIR}"
-             "${CMAKE_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}/util"
-             ${PYTHON_EXECUTABLE}
-             ${test_file})
-    set_tests_properties(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} PROPERTIES TIMEOUT 5)
-    if (${expect_fail} GREATER -1)
-        set_tests_properties(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} PROPERTIES WILL_FAIL TRUE)
-    endif(${expect_fail} GREATER -1)
-# Should set python path here
-# Looks like it's fixed in 2.8:
-# http://www.vtk.org/Bug/print_bug_page.php?bug_id=7885
-endforeach(test_file ${TEST_FILES})
+
+add_subdirectory(signals)
+TEST_QT_MODULE(QT_QTCORE_FOUND QtCore)
+TEST_QT_MODULE(QT_QTGUI_FOUND QtGui)
+TEST_QT_MODULE(QT_QTNETWORK_FOUND QtNetwork)
+TEST_QT_MODULE(QT_QTWEBKIT_FOUND QtWebKit)
+TEST_QT_MODULE(QT_QTSVG_FOUND QtSvg)
+TEST_QT_MODULE(QT_QTXML_FOUND QtXml)
+TEST_QT_MODULE(QT_QTTEST_FOUND QtTest)
+TEST_QT_MODULE(QT_QTOPENGL_FOUND QtOpenGL)
+TEST_QT_MODULE(QT_QTSQL_FOUND QtSql)
+TEST_QT_MODULE(QT_QTUITOOLS_FOUND QtUiTools)
+TEST_QT_MODULE(QT_QTHELP_FOUND QtHelp)
+TEST_QT_MODULE(QT_QTXMLPATTERNS_FOUND QtXmlPatterns)
+TEST_QT_MODULE(QT_QTMAEMO5_FOUND QtMaemo5)
+TEST_QT_MODULE(QT_QTSCRIPT_FOUND QtScript)
+TEST_QT_MODULE(QT_QTSCRIPTTOOLS_FOUND QtScriptTools)
+TEST_QT_MODULE(QT_QTMULTIMEDIA_FOUND QtMultimedia)
+TEST_QT_MODULE(QT_PHONON_FOUND phonon)
+TEST_QT_MODULE(QT_QTDECLARATIVE_FOUND QtDeclarative)
diff --git a/tests/QtCore/CMakeLists.txt b/tests/QtCore/CMakeLists.txt
new file mode 100644
index 0000000..536d408
--- /dev/null
+++ b/tests/QtCore/CMakeLists.txt
@@ -0,0 +1,71 @@
+PYSIDE_TEST(blocking_signals_test.py)
+PYSIDE_TEST(buffer_test.py)
+PYSIDE_TEST(child_event_test.py)
+PYSIDE_TEST(deletelater_test.py)
+PYSIDE_TEST(duck_punching_test.py)
+PYSIDE_TEST(missing_symbols_test.py)
+PYSIDE_TEST(qabs_test.py)
+PYSIDE_TEST(qabstracttransition_test.py)
+PYSIDE_TEST(qanimationgroup_test.py)
+PYSIDE_TEST(qbitarray_test.py)
+PYSIDE_TEST(qbytearray_buffer_protocol_test.py)
+PYSIDE_TEST(qbytearray_concatenation_operator_test.py)
+PYSIDE_TEST(qbytearray_operator_iadd_test.py)
+PYSIDE_TEST(qbytearray_operator_test.py)
+PYSIDE_TEST(qbytearray_test.py)
+PYSIDE_TEST(qchar_test.py)
+PYSIDE_TEST(qcoreapplication_instance_test.py)
+PYSIDE_TEST(qdatastream_test.py)
+PYSIDE_TEST(qdate_test.py)
+PYSIDE_TEST(qenum_test.py)
+PYSIDE_TEST(qevent_test.py)
+PYSIDE_TEST(qfileinfo_test.py)
+PYSIDE_TEST(qfile_test.py)
+PYSIDE_TEST(qflags_test.py)
+PYSIDE_TEST(qhandle_test.py)
+PYSIDE_TEST(qlatin1string_test.py)
+PYSIDE_TEST(qlinef_test.py)
+PYSIDE_TEST(qlocale_test.py)
+PYSIDE_TEST(qmetaobject_test.py)
+PYSIDE_TEST(qmodelindex_internalpointer_test.py)
+PYSIDE_TEST(qobject_children_segfault_test.py)
+PYSIDE_TEST(qobject_connect_notify_test.py)
+PYSIDE_TEST(qobject_event_filter_test.py)
+PYSIDE_TEST(qobject_inherits_test.py)
+PYSIDE_TEST(qobject_parent_test.py)
+PYSIDE_TEST(qobject_property_test.py)
+PYSIDE_TEST(qobject_protected_methods_test.py)
+PYSIDE_TEST(qobject_test.py)
+PYSIDE_TEST(qobject_timer_event_test.py)
+PYSIDE_TEST(qobject_tr_as_instance_test.py)
+PYSIDE_TEST(qpoint_test.py)
+PYSIDE_TEST(qprocess_test.py)
+PYSIDE_TEST(qrect_test.py)
+PYSIDE_TEST(qresource_test.py)
+PYSIDE_TEST(qsize_test.py)
+PYSIDE_TEST(qslot_object_test.py)
+PYSIDE_TEST(qsrand_test.py)
+PYSIDE_TEST(qstatemachine_test.py)
+PYSIDE_TEST(qstate_test.py)
+PYSIDE_TEST(qstring_buffer_protocol_test.py)
+PYSIDE_TEST(qstringlist_test.py)
+PYSIDE_TEST(qstring_operator_test.py)
+PYSIDE_TEST(qstring_test.py)
+PYSIDE_TEST(qtext_codec_test.py)
+PYSIDE_TEST(qtextstream_test.py)
+PYSIDE_TEST(qthread_prod_cons_test.py)
+PYSIDE_TEST(qthread_signal_test.py)
+PYSIDE_TEST(qthread_test.py)
+PYSIDE_TEST(qtimer_singleshot_test.py)
+PYSIDE_TEST(qtimer_timeout_test.py)
+PYSIDE_TEST(qtnamespace_test.py)
+PYSIDE_TEST(qurl_test.py)
+PYSIDE_TEST(qvariant_pyobject_test.py)
+PYSIDE_TEST(qvariant_test.py)
+PYSIDE_TEST(resources_mc.py)
+PYSIDE_TEST(static_method_test.py)
+PYSIDE_TEST(static_protected_methods_test.py)
+PYSIDE_TEST(thread_signals.py)
+PYSIDE_TEST(translation_test.py)
+PYSIDE_TEST(unaryoperator_test.py)
+PYSIDE_TEST(unicode_test.py)
diff --git a/tests/qtcore/blocking_signals_test.py b/tests/QtCore/blocking_signals_test.py
index 96582f6..96582f6 100644
--- a/tests/qtcore/blocking_signals_test.py
+++ b/tests/QtCore/blocking_signals_test.py
diff --git a/tests/qtcore/buffer_test.py b/tests/QtCore/buffer_test.py
index 2917232..2917232 100644
--- a/tests/qtcore/buffer_test.py
+++ b/tests/QtCore/buffer_test.py
diff --git a/tests/qtcore/child_event_test.py b/tests/QtCore/child_event_test.py
index ccc27c8..ccc27c8 100644
--- a/tests/qtcore/child_event_test.py
+++ b/tests/QtCore/child_event_test.py
diff --git a/tests/qtcore/deletelater_test.py b/tests/QtCore/deletelater_test.py
index 3b2f7d9..3b2f7d9 100644
--- a/tests/qtcore/deletelater_test.py
+++ b/tests/QtCore/deletelater_test.py
diff --git a/tests/qtcore/duck_punching_test.py b/tests/QtCore/duck_punching_test.py
index e20c0c1..e20c0c1 100644
--- a/tests/qtcore/duck_punching_test.py
+++ b/tests/QtCore/duck_punching_test.py
diff --git a/tests/qtcore/missing_symbols_test.py b/tests/QtCore/missing_symbols_test.py
index f535c53..f535c53 100644
--- a/tests/qtcore/missing_symbols_test.py
+++ b/tests/QtCore/missing_symbols_test.py
diff --git a/tests/qtcore/qabs_test.py b/tests/QtCore/qabs_test.py
index 1727ae6..1727ae6 100644
--- a/tests/qtcore/qabs_test.py
+++ b/tests/QtCore/qabs_test.py
diff --git a/tests/qtcore/qabstracttransition_test.py b/tests/QtCore/qabstracttransition_test.py
index 510b8ef..510b8ef 100644
--- a/tests/qtcore/qabstracttransition_test.py
+++ b/tests/QtCore/qabstracttransition_test.py
diff --git a/tests/qtcore/qanimationgroup_test.py b/tests/QtCore/qanimationgroup_test.py
index 05bd81e..05bd81e 100644
--- a/tests/qtcore/qanimationgroup_test.py
+++ b/tests/QtCore/qanimationgroup_test.py
diff --git a/tests/qtcore/qbitarray_test.py b/tests/QtCore/qbitarray_test.py
index 0ae6e1d..0ae6e1d 100755
--- a/tests/qtcore/qbitarray_test.py
+++ b/tests/QtCore/qbitarray_test.py
diff --git a/tests/qtcore/qbytearray_buffer_protocol_test.py b/tests/QtCore/qbytearray_buffer_protocol_test.py
index 117e50b..117e50b 100755
--- a/tests/qtcore/qbytearray_buffer_protocol_test.py
+++ b/tests/QtCore/qbytearray_buffer_protocol_test.py
diff --git a/tests/qtcore/qbytearray_concatenation_operator_test.py b/tests/QtCore/qbytearray_concatenation_operator_test.py
index b9a01ff..b9a01ff 100755
--- a/tests/qtcore/qbytearray_concatenation_operator_test.py
+++ b/tests/QtCore/qbytearray_concatenation_operator_test.py
diff --git a/tests/qtcore/qbytearray_operator_iadd_test.py b/tests/QtCore/qbytearray_operator_iadd_test.py
index 168f22d..168f22d 100644
--- a/tests/qtcore/qbytearray_operator_iadd_test.py
+++ b/tests/QtCore/qbytearray_operator_iadd_test.py
diff --git a/tests/qtcore/qbytearray_operator_test.py b/tests/QtCore/qbytearray_operator_test.py
index 4a20c04..4a20c04 100644
--- a/tests/qtcore/qbytearray_operator_test.py
+++ b/tests/QtCore/qbytearray_operator_test.py
diff --git a/tests/qtcore/qbytearray_test.py b/tests/QtCore/qbytearray_test.py
index 20bba14..20bba14 100644
--- a/tests/qtcore/qbytearray_test.py
+++ b/tests/QtCore/qbytearray_test.py
diff --git a/tests/qtcore/qchar_test.py b/tests/QtCore/qchar_test.py
index a40724b..a40724b 100644
--- a/tests/qtcore/qchar_test.py
+++ b/tests/QtCore/qchar_test.py
diff --git a/tests/qtcore/qcoreapplication_instance_test.py b/tests/QtCore/qcoreapplication_instance_test.py
index 365148d..365148d 100755
--- a/tests/qtcore/qcoreapplication_instance_test.py
+++ b/tests/QtCore/qcoreapplication_instance_test.py
diff --git a/tests/qtcore/qdatastream_test.py b/tests/QtCore/qdatastream_test.py
index d71ed2f..d71ed2f 100644
--- a/tests/qtcore/qdatastream_test.py
+++ b/tests/QtCore/qdatastream_test.py
diff --git a/tests/qtcore/qdate_test.py b/tests/QtCore/qdate_test.py
index 4923448..4923448 100644
--- a/tests/qtcore/qdate_test.py
+++ b/tests/QtCore/qdate_test.py
diff --git a/tests/qtcore/qenum_test.py b/tests/QtCore/qenum_test.py
index e3f9638..e3f9638 100644
--- a/tests/qtcore/qenum_test.py
+++ b/tests/QtCore/qenum_test.py
diff --git a/tests/qtcore/qevent_test.py b/tests/QtCore/qevent_test.py
index 07f23f0..07f23f0 100644
--- a/tests/qtcore/qevent_test.py
+++ b/tests/QtCore/qevent_test.py
diff --git a/tests/qtcore/qfile_test.py b/tests/QtCore/qfile_test.py
index adbdd68..adbdd68 100644
--- a/tests/qtcore/qfile_test.py
+++ b/tests/QtCore/qfile_test.py
diff --git a/tests/qtcore/qfileinfo_test.py b/tests/QtCore/qfileinfo_test.py
index 580b5a7..580b5a7 100644
--- a/tests/qtcore/qfileinfo_test.py
+++ b/tests/QtCore/qfileinfo_test.py
diff --git a/tests/qtcore/qflags_test.py b/tests/QtCore/qflags_test.py
index 1346c11..1346c11 100644
--- a/tests/qtcore/qflags_test.py
+++ b/tests/QtCore/qflags_test.py
diff --git a/tests/qtcore/qhandle_test.py b/tests/QtCore/qhandle_test.py
index bcf6dea..bcf6dea 100644
--- a/tests/qtcore/qhandle_test.py
+++ b/tests/QtCore/qhandle_test.py
diff --git a/tests/qtcore/qlatin1string_test.py b/tests/QtCore/qlatin1string_test.py
index fdcf6ec..fdcf6ec 100644
--- a/tests/qtcore/qlatin1string_test.py
+++ b/tests/QtCore/qlatin1string_test.py
diff --git a/tests/qtcore/qlinef_test.py b/tests/QtCore/qlinef_test.py
index 31b5db9..31b5db9 100644
--- a/tests/qtcore/qlinef_test.py
+++ b/tests/QtCore/qlinef_test.py
diff --git a/tests/qtcore/qlocale_test.py b/tests/QtCore/qlocale_test.py
index f1bff8e..f1bff8e 100644
--- a/tests/qtcore/qlocale_test.py
+++ b/tests/QtCore/qlocale_test.py
diff --git a/tests/qtcore/qmetaobject_test.py b/tests/QtCore/qmetaobject_test.py
index 667e763..667e763 100644
--- a/tests/qtcore/qmetaobject_test.py
+++ b/tests/QtCore/qmetaobject_test.py
diff --git a/tests/qtcore/qmodelindex_internalpointer_test.py b/tests/QtCore/qmodelindex_internalpointer_test.py
index 015d1c9..015d1c9 100644
--- a/tests/qtcore/qmodelindex_internalpointer_test.py
+++ b/tests/QtCore/qmodelindex_internalpointer_test.py
diff --git a/tests/qtcore/qobject_children_segfault_test.py b/tests/QtCore/qobject_children_segfault_test.py
index 930a082..930a082 100644
--- a/tests/qtcore/qobject_children_segfault_test.py
+++ b/tests/QtCore/qobject_children_segfault_test.py
diff --git a/tests/qtcore/qobject_connect_notify_test.py b/tests/QtCore/qobject_connect_notify_test.py
index 4410375..4410375 100644
--- a/tests/qtcore/qobject_connect_notify_test.py
+++ b/tests/QtCore/qobject_connect_notify_test.py
diff --git a/tests/qtcore/qobject_event_filter_test.py b/tests/QtCore/qobject_event_filter_test.py
index 8018fcd..8018fcd 100644
--- a/tests/qtcore/qobject_event_filter_test.py
+++ b/tests/QtCore/qobject_event_filter_test.py
diff --git a/tests/qtcore/qobject_inherits_test.py b/tests/QtCore/qobject_inherits_test.py
index 9e02b0a..9e02b0a 100644
--- a/tests/qtcore/qobject_inherits_test.py
+++ b/tests/QtCore/qobject_inherits_test.py
diff --git a/tests/qtcore/qobject_parent_test.py b/tests/QtCore/qobject_parent_test.py
index 4699fc6..4699fc6 100644
--- a/tests/qtcore/qobject_parent_test.py
+++ b/tests/QtCore/qobject_parent_test.py
diff --git a/tests/qtcore/qobject_property_test.py b/tests/QtCore/qobject_property_test.py
index 33df2ac..33df2ac 100644
--- a/tests/qtcore/qobject_property_test.py
+++ b/tests/QtCore/qobject_property_test.py
diff --git a/tests/qtcore/qobject_protected_methods_test.py b/tests/QtCore/qobject_protected_methods_test.py
index 530b870..530b870 100644
--- a/tests/qtcore/qobject_protected_methods_test.py
+++ b/tests/QtCore/qobject_protected_methods_test.py
diff --git a/tests/qtcore/qobject_test.py b/tests/QtCore/qobject_test.py
index a1749ba..a1749ba 100644
--- a/tests/qtcore/qobject_test.py
+++ b/tests/QtCore/qobject_test.py
diff --git a/tests/qtcore/qobject_timer_event_test.py b/tests/QtCore/qobject_timer_event_test.py
index b46207d..b46207d 100644
--- a/tests/qtcore/qobject_timer_event_test.py
+++ b/tests/QtCore/qobject_timer_event_test.py
diff --git a/tests/qtcore/qobject_tr_as_instance_test.py b/tests/QtCore/qobject_tr_as_instance_test.py
index 5aa7053..5aa7053 100644
--- a/tests/qtcore/qobject_tr_as_instance_test.py
+++ b/tests/QtCore/qobject_tr_as_instance_test.py
diff --git a/tests/qtcore/qpoint_test.py b/tests/QtCore/qpoint_test.py
index dfce769..dfce769 100644
--- a/tests/qtcore/qpoint_test.py
+++ b/tests/QtCore/qpoint_test.py
diff --git a/tests/qtcore/qprocess_test.py b/tests/QtCore/qprocess_test.py
index b01c68b..b01c68b 100644
--- a/tests/qtcore/qprocess_test.py
+++ b/tests/QtCore/qprocess_test.py
diff --git a/tests/qtcore/qrect_test.py b/tests/QtCore/qrect_test.py
index 3c5f5be..3c5f5be 100644
--- a/tests/qtcore/qrect_test.py
+++ b/tests/QtCore/qrect_test.py
diff --git a/tests/qtcore/qresource_test.py b/tests/QtCore/qresource_test.py
index 8f3350a..8f3350a 100644
--- a/tests/qtcore/qresource_test.py
+++ b/tests/QtCore/qresource_test.py
diff --git a/tests/qtcore/qsize_test.py b/tests/QtCore/qsize_test.py
index 4fb060b..4fb060b 100644
--- a/tests/qtcore/qsize_test.py
+++ b/tests/QtCore/qsize_test.py
diff --git a/tests/qtcore/qslot_object_test.py b/tests/QtCore/qslot_object_test.py
index ad0ea3a..ad0ea3a 100644
--- a/tests/qtcore/qslot_object_test.py
+++ b/tests/QtCore/qslot_object_test.py
diff --git a/tests/qtcore/qsrand_test.py b/tests/QtCore/qsrand_test.py
index 97d0a3b..97d0a3b 100644
--- a/tests/qtcore/qsrand_test.py
+++ b/tests/QtCore/qsrand_test.py
diff --git a/tests/qtcore/qstate_test.py b/tests/QtCore/qstate_test.py
index d7c9a4c..d7c9a4c 100644
--- a/tests/qtcore/qstate_test.py
+++ b/tests/QtCore/qstate_test.py
diff --git a/tests/qtcore/qstatemachine_test.py b/tests/QtCore/qstatemachine_test.py
index ce2449d..ce2449d 100644
--- a/tests/qtcore/qstatemachine_test.py
+++ b/tests/QtCore/qstatemachine_test.py
diff --git a/tests/qtcore/qstring_buffer_protocol_test.py b/tests/QtCore/qstring_buffer_protocol_test.py
index f8475d0..f8475d0 100755
--- a/tests/qtcore/qstring_buffer_protocol_test.py
+++ b/tests/QtCore/qstring_buffer_protocol_test.py
diff --git a/tests/qtcore/qstring_operator_test.py b/tests/QtCore/qstring_operator_test.py
index 6d7ae31..6d7ae31 100644
--- a/tests/qtcore/qstring_operator_test.py
+++ b/tests/QtCore/qstring_operator_test.py
diff --git a/tests/qtcore/qstring_test.py b/tests/QtCore/qstring_test.py
index 3f0fb49..3f0fb49 100644
--- a/tests/qtcore/qstring_test.py
+++ b/tests/QtCore/qstring_test.py
diff --git a/tests/qtcore/qstringlist_test.py b/tests/QtCore/qstringlist_test.py
index 0310516..0310516 100644
--- a/tests/qtcore/qstringlist_test.py
+++ b/tests/QtCore/qstringlist_test.py
diff --git a/tests/qtcore/qtext_codec_test.py b/tests/QtCore/qtext_codec_test.py
index 2bd7f81..2bd7f81 100644
--- a/tests/qtcore/qtext_codec_test.py
+++ b/tests/QtCore/qtext_codec_test.py
diff --git a/tests/qtcore/qtextstream_test.py b/tests/QtCore/qtextstream_test.py
index 13dc651..13dc651 100644
--- a/tests/qtcore/qtextstream_test.py
+++ b/tests/QtCore/qtextstream_test.py
diff --git a/tests/qtcore/qthread_prod_cons_test.py b/tests/QtCore/qthread_prod_cons_test.py
index fc634dd..fc634dd 100644
--- a/tests/qtcore/qthread_prod_cons_test.py
+++ b/tests/QtCore/qthread_prod_cons_test.py
diff --git a/tests/qtcore/qthread_signal_test.py b/tests/QtCore/qthread_signal_test.py
index edd7d77..edd7d77 100755
--- a/tests/qtcore/qthread_signal_test.py
+++ b/tests/QtCore/qthread_signal_test.py
diff --git a/tests/qtcore/qthread_test.py b/tests/QtCore/qthread_test.py
index 410afb9..410afb9 100644
--- a/tests/qtcore/qthread_test.py
+++ b/tests/QtCore/qthread_test.py
diff --git a/tests/qtcore/qtimer_singleshot_test.py b/tests/QtCore/qtimer_singleshot_test.py
index 96107ec..96107ec 100644
--- a/tests/qtcore/qtimer_singleshot_test.py
+++ b/tests/QtCore/qtimer_singleshot_test.py
diff --git a/tests/qtcore/qtimer_timeout_test.py b/tests/QtCore/qtimer_timeout_test.py
index 8dfe395..8dfe395 100644
--- a/tests/qtcore/qtimer_timeout_test.py
+++ b/tests/QtCore/qtimer_timeout_test.py
diff --git a/tests/qtcore/qtnamespace_test.py b/tests/QtCore/qtnamespace_test.py
index 3343a27..3343a27 100644
--- a/tests/qtcore/qtnamespace_test.py
+++ b/tests/QtCore/qtnamespace_test.py
diff --git a/tests/qtcore/quoteEnUS.txt b/tests/QtCore/quoteEnUS.txt
index 909b4fa..909b4fa 100644
--- a/tests/qtcore/quoteEnUS.txt
+++ b/tests/QtCore/quoteEnUS.txt
diff --git a/tests/qtcore/qurl_test.py b/tests/QtCore/qurl_test.py
index 14243a1..14243a1 100644
--- a/tests/qtcore/qurl_test.py
+++ b/tests/QtCore/qurl_test.py
diff --git a/tests/qtcore/qvariant_pyobject_test.py b/tests/QtCore/qvariant_pyobject_test.py
index 82da555..82da555 100644
--- a/tests/qtcore/qvariant_pyobject_test.py
+++ b/tests/QtCore/qvariant_pyobject_test.py
diff --git a/tests/qtcore/qvariant_test.py b/tests/QtCore/qvariant_test.py
index 5c23b40..5c23b40 100644
--- a/tests/qtcore/qvariant_test.py
+++ b/tests/QtCore/qvariant_test.py
diff --git a/tests/qtcore/resources.qrc b/tests/QtCore/resources.qrc
index cea17b4..cea17b4 100644
--- a/tests/qtcore/resources.qrc
+++ b/tests/QtCore/resources.qrc
diff --git a/tests/qtcore/resources_mc.py b/tests/QtCore/resources_mc.py
index 132c8db..132c8db 100644
--- a/tests/qtcore/resources_mc.py
+++ b/tests/QtCore/resources_mc.py
diff --git a/tests/qtcore/static_method_test.py b/tests/QtCore/static_method_test.py
index 1f9de78..1f9de78 100755
--- a/tests/qtcore/static_method_test.py
+++ b/tests/QtCore/static_method_test.py
diff --git a/tests/qtcore/static_protected_methods_test.py b/tests/QtCore/static_protected_methods_test.py
index 9d920a4..9d920a4 100644
--- a/tests/qtcore/static_protected_methods_test.py
+++ b/tests/QtCore/static_protected_methods_test.py
diff --git a/tests/qtcore/thread_signals.py b/tests/QtCore/thread_signals.py
index e2b6673..9eea829 100644
--- a/tests/qtcore/thread_signals.py
+++ b/tests/QtCore/thread_signals.py
@@ -5,14 +5,13 @@ import unittest
 import os
 from tempfile import mkstemp
 
-from PySide.QtCore import QObject, SIGNAL, QFile, QThread, QTimer
+from PySide.QtCore import QObject, SIGNAL, QFile, QThread, QTimer, Qt
 from helper import UsesQCoreApplication
 
 class MyThread(QThread):
 
     def run(self):
-        self.emit(SIGNAL("test(const QString&)"),
-                  "INdT - PySide");
+        self.emit(SIGNAL("test(const QString&)"), "INdT - PySide");
 
 class TestThreadSignal(UsesQCoreApplication):
 
@@ -20,18 +19,13 @@ class TestThreadSignal(UsesQCoreApplication):
     def _callback(self, msg):
         self.assertEqual(msg, "INdT - PySide")
         self.__called__ = True
-        self._quit()
-
-    def _quit(self):
         self.app.quit()
 
     def testThread(self):
         t = MyThread()
-        QObject.connect(t, SIGNAL("test(const QString&)"),
-                        self._callback);
-
+        QObject.connect(t, SIGNAL("test(const QString&)"), self._callback);
         t.start()
-        QTimer.singleShot(100, self._quit)
+
         self.app.exec_()
         self.assert_(self.__called__);
 
diff --git a/tests/qtcore/translation_test.py b/tests/QtCore/translation_test.py
index 870c8c5..870c8c5 100644
--- a/tests/qtcore/translation_test.py
+++ b/tests/QtCore/translation_test.py
diff --git a/tests/qtcore/translations/trans_latin.ts b/tests/QtCore/translations/trans_latin.ts
index b9fcf41..b9fcf41 100644
--- a/tests/qtcore/translations/trans_latin.ts
+++ b/tests/QtCore/translations/trans_latin.ts
diff --git a/tests/qtcore/translations/trans_russian.ts b/tests/QtCore/translations/trans_russian.ts
index d1ba49b..d1ba49b 100644
--- a/tests/qtcore/translations/trans_russian.ts
+++ b/tests/QtCore/translations/trans_russian.ts
diff --git a/tests/qtcore/unaryoperator_test.py b/tests/QtCore/unaryoperator_test.py
index 94db1fe..94db1fe 100755
--- a/tests/qtcore/unaryoperator_test.py
+++ b/tests/QtCore/unaryoperator_test.py
diff --git a/tests/qtcore/unicode_test.py b/tests/QtCore/unicode_test.py
index f0bb883..f0bb883 100644
--- a/tests/qtcore/unicode_test.py
+++ b/tests/QtCore/unicode_test.py
diff --git a/tests/QtDeclarative/CMakeLists.txt b/tests/QtDeclarative/CMakeLists.txt
new file mode 100644
index 0000000..4896010
--- /dev/null
+++ b/tests/QtDeclarative/CMakeLists.txt
@@ -0,0 +1,2 @@
+PYSIDE_TEST(qdeclarativenetwork_test.py FALSE)
+PYSIDE_TEST(qdeclarativeview_test.py FALSE)
diff --git a/tests/qtdeclarative/network.qml b/tests/QtDeclarative/network.qml
index 4b849e0..4b849e0 100644
--- a/tests/qtdeclarative/network.qml
+++ b/tests/QtDeclarative/network.qml
diff --git a/tests/qtdeclarative/qdeclarativenetwork_test.py b/tests/QtDeclarative/qdeclarativenetwork_test.py
index a03a484..a03a484 100644
--- a/tests/qtdeclarative/qdeclarativenetwork_test.py
+++ b/tests/QtDeclarative/qdeclarativenetwork_test.py
diff --git a/tests/qtdeclarative/qdeclarativeview_test.py b/tests/QtDeclarative/qdeclarativeview_test.py
index 8101c5f..8101c5f 100644
--- a/tests/qtdeclarative/qdeclarativeview_test.py
+++ b/tests/QtDeclarative/qdeclarativeview_test.py
diff --git a/tests/qtdeclarative/view.qml b/tests/QtDeclarative/view.qml
index ec5597d..ec5597d 100644
--- a/tests/qtdeclarative/view.qml
+++ b/tests/QtDeclarative/view.qml
diff --git a/tests/QtGui/CMakeLists.txt b/tests/QtGui/CMakeLists.txt
new file mode 100644
index 0000000..fb6d801
--- /dev/null
+++ b/tests/QtGui/CMakeLists.txt
@@ -0,0 +1,58 @@
+PYSIDE_TEST(add_action_test.py)
+PYSIDE_TEST(customproxywidget_test.py)
+PYSIDE_TEST(float_to_int_implicit_conversion_test.py)
+PYSIDE_TEST(grandparent_method_test.py)
+PYSIDE_TEST(hashabletype_test.py)
+PYSIDE_TEST(keep_reference_test.py)
+PYSIDE_TEST(missing_symbols_test.py)
+PYSIDE_TEST(paint_event_test.py)
+PYSIDE_TEST(parent_method_test.py)
+PYSIDE_TEST(python_properties_test.py)
+PYSIDE_TEST(qapplication_exit_segfault_test.py)
+PYSIDE_TEST(qapplication_singleton_test.py)
+PYSIDE_TEST(qapp_test.py)
+PYSIDE_TEST(qbrush_test.py)
+PYSIDE_TEST(qcolor_test.py)
+PYSIDE_TEST(qdatastream_gui_operators_test.py)
+PYSIDE_TEST(qfontdialog_test.py)
+PYSIDE_TEST(qfontmetrics_test.py)
+PYSIDE_TEST(qgraphicsitem_isblocked_test.py)
+PYSIDE_TEST(qgraphicsitem_test.py)
+PYSIDE_TEST(qgraphicsproxywidget_test.py)
+PYSIDE_TEST(qgraphicsscene_test.py)
+PYSIDE_TEST(qinputdialog_get_test.py)
+PYSIDE_TEST(qitemselection_test.py)
+PYSIDE_TEST(qlayout_ref_test.py)
+PYSIDE_TEST(qlayout_test.py)
+PYSIDE_TEST(qlcdnumber_test.py)
+PYSIDE_TEST(qlistwidgetitem_test.py)
+PYSIDE_TEST(qmainwindow_test.py)
+PYSIDE_TEST(qmatrix_test.py)
+PYSIDE_TEST(qmenuadd_test.py)
+PYSIDE_TEST(qmenu_test.py)
+PYSIDE_TEST(qobject_mi_test.py)
+PYSIDE_TEST(qpainter_test.py)
+PYSIDE_TEST(qpen_test.py)
+PYSIDE_TEST(qpixmap_test.py)
+PYSIDE_TEST(qpushbutton_test.py)
+PYSIDE_TEST(qradialgradient_test.py)
+PYSIDE_TEST(qregion_test.py)
+PYSIDE_TEST(qshortcut_test.py)
+PYSIDE_TEST(qstandarditemmodel_test.py)
+PYSIDE_TEST(qstring_qkeysequence_test.py)
+PYSIDE_TEST(qstyle_test.py)
+PYSIDE_TEST(qtableview_test.py)
+PYSIDE_TEST(qtabwidget_test.py)
+PYSIDE_TEST(qtextedit_test.py)
+PYSIDE_TEST(qtoolbar_test.py)
+PYSIDE_TEST(qtoolbox_test.py)
+PYSIDE_TEST(qvariant_test.py)
+PYSIDE_TEST(qwidget_setlayout_test.py)
+PYSIDE_TEST(qwidget_test.py TRUE) #Bug 237
+PYSIDE_TEST(reference_count_test.py)
+PYSIDE_TEST(standardpixmap_test.py)
+PYSIDE_TEST(timed_app_test.py)
+PYSIDE_TEST(virtual_protected_inheritance_test.py)
+PYSIDE_TEST(virtual_pure_override.py)
+PYSIDE_TEST(wrong_return_test.py)
+PYSIDE_TEST(x11_symbols.py)
diff --git a/tests/qtgui/add_action_test.py b/tests/QtGui/add_action_test.py
index 7e20c45..7e20c45 100644
--- a/tests/qtgui/add_action_test.py
+++ b/tests/QtGui/add_action_test.py
diff --git a/tests/qtgui/customproxywidget_test.py b/tests/QtGui/customproxywidget_test.py
index b9ccdff..b9ccdff 100755
--- a/tests/qtgui/customproxywidget_test.py
+++ b/tests/QtGui/customproxywidget_test.py
diff --git a/tests/qtgui/float_to_int_implicit_conversion_test.py b/tests/QtGui/float_to_int_implicit_conversion_test.py
index cc7d18f..cc7d18f 100644
--- a/tests/qtgui/float_to_int_implicit_conversion_test.py
+++ b/tests/QtGui/float_to_int_implicit_conversion_test.py
diff --git a/tests/qtgui/grandparent_method_test.py b/tests/QtGui/grandparent_method_test.py
index 3c18293..3c18293 100644
--- a/tests/qtgui/grandparent_method_test.py
+++ b/tests/QtGui/grandparent_method_test.py
diff --git a/tests/qtgui/hashabletype_test.py b/tests/QtGui/hashabletype_test.py
index 64683a3..64683a3 100644
--- a/tests/qtgui/hashabletype_test.py
+++ b/tests/QtGui/hashabletype_test.py
diff --git a/tests/qtgui/keep_reference_test.py b/tests/QtGui/keep_reference_test.py
index d0962d5..d0962d5 100755
--- a/tests/qtgui/keep_reference_test.py
+++ b/tests/QtGui/keep_reference_test.py
diff --git a/tests/qtgui/missing_symbols_test.py b/tests/QtGui/missing_symbols_test.py
index de23c56..de23c56 100644
--- a/tests/qtgui/missing_symbols_test.py
+++ b/tests/QtGui/missing_symbols_test.py
diff --git a/tests/qtgui/paint_event_test.py b/tests/QtGui/paint_event_test.py
index 0225390..0225390 100644
--- a/tests/qtgui/paint_event_test.py
+++ b/tests/QtGui/paint_event_test.py
diff --git a/tests/qtgui/parent_method_test.py b/tests/QtGui/parent_method_test.py
index 8d0ba96..8d0ba96 100644
--- a/tests/qtgui/parent_method_test.py
+++ b/tests/QtGui/parent_method_test.py
diff --git a/tests/qtgui/python_properties_test.py b/tests/QtGui/python_properties_test.py
index 7d6c024..7d6c024 100644
--- a/tests/qtgui/python_properties_test.py
+++ b/tests/QtGui/python_properties_test.py
diff --git a/tests/qtgui/qapp_test.py b/tests/QtGui/qapp_test.py
index c371492..c371492 100644
--- a/tests/qtgui/qapp_test.py
+++ b/tests/QtGui/qapp_test.py
diff --git a/tests/qtgui/qapplication_exit_segfault_test.py b/tests/QtGui/qapplication_exit_segfault_test.py
index 72b810a..72b810a 100644
--- a/tests/qtgui/qapplication_exit_segfault_test.py
+++ b/tests/QtGui/qapplication_exit_segfault_test.py
diff --git a/tests/qtgui/qapplication_singleton_test.py b/tests/QtGui/qapplication_singleton_test.py
index 9c959f9..9c959f9 100644
--- a/tests/qtgui/qapplication_singleton_test.py
+++ b/tests/QtGui/qapplication_singleton_test.py
diff --git a/tests/qtgui/qbrush_test.py b/tests/QtGui/qbrush_test.py
index cf11652..cf11652 100644
--- a/tests/qtgui/qbrush_test.py
+++ b/tests/QtGui/qbrush_test.py
diff --git a/tests/qtgui/qcolor_test.py b/tests/QtGui/qcolor_test.py
index 3c2f11b..3c2f11b 100644
--- a/tests/qtgui/qcolor_test.py
+++ b/tests/QtGui/qcolor_test.py
diff --git a/tests/qtgui/qdatastream_gui_operators_test.py b/tests/QtGui/qdatastream_gui_operators_test.py
index dbb638f..dbb638f 100644
--- a/tests/qtgui/qdatastream_gui_operators_test.py
+++ b/tests/QtGui/qdatastream_gui_operators_test.py
diff --git a/tests/qtgui/qfontdialog_test.py b/tests/QtGui/qfontdialog_test.py
index 02bce78..02bce78 100644
--- a/tests/qtgui/qfontdialog_test.py
+++ b/tests/QtGui/qfontdialog_test.py
diff --git a/tests/qtgui/qfontmetrics_test.py b/tests/QtGui/qfontmetrics_test.py
index 7964d91..7964d91 100644
--- a/tests/qtgui/qfontmetrics_test.py
+++ b/tests/QtGui/qfontmetrics_test.py
diff --git a/tests/qtgui/qgraphicsitem_isblocked_test.py b/tests/QtGui/qgraphicsitem_isblocked_test.py
index b281c8a..b281c8a 100755
--- a/tests/qtgui/qgraphicsitem_isblocked_test.py
+++ b/tests/QtGui/qgraphicsitem_isblocked_test.py
diff --git a/tests/qtgui/qgraphicsitem_test.py b/tests/QtGui/qgraphicsitem_test.py
index 43545a4..43545a4 100644
--- a/tests/qtgui/qgraphicsitem_test.py
+++ b/tests/QtGui/qgraphicsitem_test.py
diff --git a/tests/qtgui/qgraphicsproxywidget_test.py b/tests/QtGui/qgraphicsproxywidget_test.py
index 3a856bc..3a856bc 100755
--- a/tests/qtgui/qgraphicsproxywidget_test.py
+++ b/tests/QtGui/qgraphicsproxywidget_test.py
diff --git a/tests/qtgui/qgraphicsscene_test.py b/tests/QtGui/qgraphicsscene_test.py
index 98177e7..98177e7 100644
--- a/tests/qtgui/qgraphicsscene_test.py
+++ b/tests/QtGui/qgraphicsscene_test.py
diff --git a/tests/qtgui/qinputdialog_get_test.py b/tests/QtGui/qinputdialog_get_test.py
index c75f712..c75f712 100644
--- a/tests/qtgui/qinputdialog_get_test.py
+++ b/tests/QtGui/qinputdialog_get_test.py
diff --git a/tests/qtgui/qitemselection_test.py b/tests/QtGui/qitemselection_test.py
index 8c6c34e..8c6c34e 100644
--- a/tests/qtgui/qitemselection_test.py
+++ b/tests/QtGui/qitemselection_test.py
diff --git a/tests/qtgui/qlayout_ref_test.py b/tests/QtGui/qlayout_ref_test.py
index a634271..a634271 100644
--- a/tests/qtgui/qlayout_ref_test.py
+++ b/tests/QtGui/qlayout_ref_test.py
diff --git a/tests/qtgui/qlayout_test.py b/tests/QtGui/qlayout_test.py
index ae773bb..ae773bb 100644
--- a/tests/qtgui/qlayout_test.py
+++ b/tests/QtGui/qlayout_test.py
diff --git a/tests/qtgui/qlcdnumber_test.py b/tests/QtGui/qlcdnumber_test.py
index eb6a4f3..eb6a4f3 100644
--- a/tests/qtgui/qlcdnumber_test.py
+++ b/tests/QtGui/qlcdnumber_test.py
diff --git a/tests/qtgui/qlistwidgetitem_test.py b/tests/QtGui/qlistwidgetitem_test.py
index 8f96c51..8f96c51 100644
--- a/tests/qtgui/qlistwidgetitem_test.py
+++ b/tests/QtGui/qlistwidgetitem_test.py
diff --git a/tests/qtgui/qmainwindow_test.py b/tests/QtGui/qmainwindow_test.py
index fce145d..fce145d 100644
--- a/tests/qtgui/qmainwindow_test.py
+++ b/tests/QtGui/qmainwindow_test.py
diff --git a/tests/qtgui/qmatrix_test.py b/tests/QtGui/qmatrix_test.py
index 7c87e23..7c87e23 100644
--- a/tests/qtgui/qmatrix_test.py
+++ b/tests/QtGui/qmatrix_test.py
diff --git a/tests/qtgui/qmenu_test.py b/tests/QtGui/qmenu_test.py
index 37faf16..37faf16 100644
--- a/tests/qtgui/qmenu_test.py
+++ b/tests/QtGui/qmenu_test.py
diff --git a/tests/qtgui/qmenuadd_test.py b/tests/QtGui/qmenuadd_test.py
index 47b112b..47b112b 100644
--- a/tests/qtgui/qmenuadd_test.py
+++ b/tests/QtGui/qmenuadd_test.py
diff --git a/tests/qtgui/qobject_mi_test.py b/tests/QtGui/qobject_mi_test.py
index 8ccc1d3..8ccc1d3 100644
--- a/tests/qtgui/qobject_mi_test.py
+++ b/tests/QtGui/qobject_mi_test.py
diff --git a/tests/qtgui/qpainter_test.py b/tests/QtGui/qpainter_test.py
index ad1d1e4..ad1d1e4 100644
--- a/tests/qtgui/qpainter_test.py
+++ b/tests/QtGui/qpainter_test.py
diff --git a/tests/qtgui/qpen_test.py b/tests/QtGui/qpen_test.py
index f9e9b18..f9e9b18 100644
--- a/tests/qtgui/qpen_test.py
+++ b/tests/QtGui/qpen_test.py
diff --git a/tests/qtgui/qpixmap_test.py b/tests/QtGui/qpixmap_test.py
index 4814094..4814094 100644
--- a/tests/qtgui/qpixmap_test.py
+++ b/tests/QtGui/qpixmap_test.py
diff --git a/tests/qtgui/qpushbutton_test.py b/tests/QtGui/qpushbutton_test.py
index 9849608..9849608 100644
--- a/tests/qtgui/qpushbutton_test.py
+++ b/tests/QtGui/qpushbutton_test.py
diff --git a/tests/qtgui/qradialgradient_test.py b/tests/QtGui/qradialgradient_test.py
index 0c582c3..0c582c3 100644
--- a/tests/qtgui/qradialgradient_test.py
+++ b/tests/QtGui/qradialgradient_test.py
diff --git a/tests/qtgui/qregion_test.py b/tests/QtGui/qregion_test.py
index 2274d5e..2274d5e 100644
--- a/tests/qtgui/qregion_test.py
+++ b/tests/QtGui/qregion_test.py
diff --git a/tests/qtgui/qshortcut_test.py b/tests/QtGui/qshortcut_test.py
index c9cb3bc..c9cb3bc 100644
--- a/tests/qtgui/qshortcut_test.py
+++ b/tests/QtGui/qshortcut_test.py
diff --git a/tests/qtgui/qstandarditemmodel_test.py b/tests/QtGui/qstandarditemmodel_test.py
index d83d856..d83d856 100644
--- a/tests/qtgui/qstandarditemmodel_test.py
+++ b/tests/QtGui/qstandarditemmodel_test.py
diff --git a/tests/qtgui/qstring_qkeysequence_test.py b/tests/QtGui/qstring_qkeysequence_test.py
index 1f435e6..1f435e6 100644
--- a/tests/qtgui/qstring_qkeysequence_test.py
+++ b/tests/QtGui/qstring_qkeysequence_test.py
diff --git a/tests/qtgui/qstyle_test.py b/tests/QtGui/qstyle_test.py
index da467e8..da467e8 100755
--- a/tests/qtgui/qstyle_test.py
+++ b/tests/QtGui/qstyle_test.py
diff --git a/tests/qtgui/qtableview_test.py b/tests/QtGui/qtableview_test.py
index 0ea5cab..0ea5cab 100644
--- a/tests/qtgui/qtableview_test.py
+++ b/tests/QtGui/qtableview_test.py
diff --git a/tests/qtgui/qtabwidget_test.py b/tests/QtGui/qtabwidget_test.py
index 143f99c..143f99c 100644
--- a/tests/qtgui/qtabwidget_test.py
+++ b/tests/QtGui/qtabwidget_test.py
diff --git a/tests/qtgui/qtextedit_test.py b/tests/QtGui/qtextedit_test.py
index 442cbe2..442cbe2 100644
--- a/tests/qtgui/qtextedit_test.py
+++ b/tests/QtGui/qtextedit_test.py
diff --git a/tests/qtgui/qtoolbar_test.py b/tests/QtGui/qtoolbar_test.py
index 1bcf566..1bcf566 100644
--- a/tests/qtgui/qtoolbar_test.py
+++ b/tests/QtGui/qtoolbar_test.py
diff --git a/tests/qtgui/qtoolbox_test.py b/tests/QtGui/qtoolbox_test.py
index dd0d2c6..dd0d2c6 100644
--- a/tests/qtgui/qtoolbox_test.py
+++ b/tests/QtGui/qtoolbox_test.py
diff --git a/tests/qtgui/qvariant_test.py b/tests/QtGui/qvariant_test.py
index 138e432..138e432 100644
--- a/tests/qtgui/qvariant_test.py
+++ b/tests/QtGui/qvariant_test.py
diff --git a/tests/qtgui/qwidget_setlayout_test.py b/tests/QtGui/qwidget_setlayout_test.py
index c715396..c715396 100644
--- a/tests/qtgui/qwidget_setlayout_test.py
+++ b/tests/QtGui/qwidget_setlayout_test.py
diff --git a/tests/qtgui/qwidget_test.py b/tests/QtGui/qwidget_test.py
index a14311c..a14311c 100644
--- a/tests/qtgui/qwidget_test.py
+++ b/tests/QtGui/qwidget_test.py
diff --git a/tests/qtgui/reference_count_test.py b/tests/QtGui/reference_count_test.py
index b549868..b549868 100644
--- a/tests/qtgui/reference_count_test.py
+++ b/tests/QtGui/reference_count_test.py
diff --git a/tests/qtgui/sample.png b/tests/QtGui/sample.png
index 60450f0..60450f0 100644
--- a/tests/qtgui/sample.png
+++ b/tests/QtGui/sample.png
diff --git a/tests/qtgui/standardpixmap_test.py b/tests/QtGui/standardpixmap_test.py
index 65bd322..65bd322 100644
--- a/tests/qtgui/standardpixmap_test.py
+++ b/tests/QtGui/standardpixmap_test.py
diff --git a/tests/qtgui/timed_app_test.py b/tests/QtGui/timed_app_test.py
index 4af9a01..4af9a01 100644
--- a/tests/qtgui/timed_app_test.py
+++ b/tests/QtGui/timed_app_test.py
diff --git a/tests/qtgui/virtual_protected_inheritance_test.py b/tests/QtGui/virtual_protected_inheritance_test.py
index 15de37d..15de37d 100644
--- a/tests/qtgui/virtual_protected_inheritance_test.py
+++ b/tests/QtGui/virtual_protected_inheritance_test.py
diff --git a/tests/qtgui/virtual_pure_override.py b/tests/QtGui/virtual_pure_override.py
index c496e49..c496e49 100644
--- a/tests/qtgui/virtual_pure_override.py
+++ b/tests/QtGui/virtual_pure_override.py
diff --git a/tests/qtgui/wrong_return_test.py b/tests/QtGui/wrong_return_test.py
index d14ac9e..d14ac9e 100644
--- a/tests/qtgui/wrong_return_test.py
+++ b/tests/QtGui/wrong_return_test.py
diff --git a/tests/qtgui/x11_symbols.py b/tests/QtGui/x11_symbols.py
index 29cce15..29cce15 100644
--- a/tests/qtgui/x11_symbols.py
+++ b/tests/QtGui/x11_symbols.py
diff --git a/tests/QtHelp/CMakeLists.txt b/tests/QtHelp/CMakeLists.txt
new file mode 100644
index 0000000..d0ba2d8
--- /dev/null
+++ b/tests/QtHelp/CMakeLists.txt
@@ -0,0 +1 @@
+PYSIDE_TEST(help_test.py)
diff --git a/tests/qthelp/help_test.py b/tests/QtHelp/help_test.py
index e2ff532..e2ff532 100644
--- a/tests/qthelp/help_test.py
+++ b/tests/QtHelp/help_test.py
diff --git a/tests/QtMaemo5/CMakeLists.txt b/tests/QtMaemo5/CMakeLists.txt
new file mode 100644
index 0000000..73bb316
--- /dev/null
+++ b/tests/QtMaemo5/CMakeLists.txt
@@ -0,0 +1,2 @@
+PYSIDE_TEST(pickselector_test.py)
+PYSIDE_TEST(qmaemo5import_test.py)
diff --git a/tests/qtmaemo5/pickselector_test.py b/tests/QtMaemo5/pickselector_test.py
index 013c1d4..013c1d4 100644
--- a/tests/qtmaemo5/pickselector_test.py
+++ b/tests/QtMaemo5/pickselector_test.py
diff --git a/tests/qtmaemo5/qmaemo5import_test.py b/tests/QtMaemo5/qmaemo5import_test.py
index a003f05..a003f05 100644
--- a/tests/qtmaemo5/qmaemo5import_test.py
+++ b/tests/QtMaemo5/qmaemo5import_test.py
diff --git a/tests/QtMultimedia/CMakeLists.txt b/tests/QtMultimedia/CMakeLists.txt
new file mode 100644
index 0000000..62150eb
--- /dev/null
+++ b/tests/QtMultimedia/CMakeLists.txt
@@ -0,0 +1 @@
+PYSIDE_TEST(audio_test.py)
diff --git a/tests/qtmultimedia/audio_test.py b/tests/QtMultimedia/audio_test.py
index 04d0a1e..04d0a1e 100644
--- a/tests/qtmultimedia/audio_test.py
+++ b/tests/QtMultimedia/audio_test.py
diff --git a/tests/QtNetwork/CMakeLists.txt b/tests/QtNetwork/CMakeLists.txt
new file mode 100644
index 0000000..cae1470
--- /dev/null
+++ b/tests/QtNetwork/CMakeLists.txt
@@ -0,0 +1,4 @@
+PYSIDE_TEST(accessManager_test.py)
+PYSIDE_TEST(http_test.py)
+PYSIDE_TEST(tcpserver_test.py)
+PYSIDE_TEST(udpsocket_test.py)
diff --git a/tests/qtnetwork/accessManager_test.py b/tests/QtNetwork/accessManager_test.py
index 9a00e7e..9a00e7e 100644
--- a/tests/qtnetwork/accessManager_test.py
+++ b/tests/QtNetwork/accessManager_test.py
diff --git a/tests/qtnetwork/http_test.py b/tests/QtNetwork/http_test.py
index 379ff5d..379ff5d 100644
--- a/tests/qtnetwork/http_test.py
+++ b/tests/QtNetwork/http_test.py
diff --git a/tests/qtnetwork/tcpserver_test.py b/tests/QtNetwork/tcpserver_test.py
index 77f830e..77f830e 100644
--- a/tests/qtnetwork/tcpserver_test.py
+++ b/tests/QtNetwork/tcpserver_test.py
diff --git a/tests/qtnetwork/udpsocket_test.py b/tests/QtNetwork/udpsocket_test.py
index 26cff7f..26cff7f 100644
--- a/tests/qtnetwork/udpsocket_test.py
+++ b/tests/QtNetwork/udpsocket_test.py
diff --git a/tests/QtOpenGL/CMakeLists.txt b/tests/QtOpenGL/CMakeLists.txt
new file mode 100644
index 0000000..3064edf
--- /dev/null
+++ b/tests/QtOpenGL/CMakeLists.txt
@@ -0,0 +1,3 @@
+if(${QTVERSION} VERSION_GREATER 4.6.9)
+    PYSIDE_TEST(qglbuffer_test.py)
+endif()
diff --git a/tests/qtopengl/qglbuffer_test.py b/tests/QtOpenGL/qglbuffer_test.py
index ae23fbd..ae23fbd 100644
--- a/tests/qtopengl/qglbuffer_test.py
+++ b/tests/QtOpenGL/qglbuffer_test.py
diff --git a/tests/QtScript/CMakeLists.txt b/tests/QtScript/CMakeLists.txt
new file mode 100644
index 0000000..b76a262
--- /dev/null
+++ b/tests/QtScript/CMakeLists.txt
@@ -0,0 +1,3 @@
+PYSIDE_TEST(base_test.py)
+PYSIDE_TEST(engine_test.py)
+PYSIDE_TEST(test_base.py)
diff --git a/tests/qtscript/base_test.py b/tests/QtScript/base_test.py
index 6ad27e0..6ad27e0 100644
--- a/tests/qtscript/base_test.py
+++ b/tests/QtScript/base_test.py
diff --git a/tests/qtscript/engine_test.py b/tests/QtScript/engine_test.py
index 074d3df..074d3df 100644
--- a/tests/qtscript/engine_test.py
+++ b/tests/QtScript/engine_test.py
diff --git a/tests/qtscript/test_base.py b/tests/QtScript/test_base.py
index 6ad27e0..6ad27e0 100644
--- a/tests/qtscript/test_base.py
+++ b/tests/QtScript/test_base.py
diff --git a/tests/QtScriptTools/CMakeLists.txt b/tests/QtScriptTools/CMakeLists.txt
new file mode 100644
index 0000000..ee22737
--- /dev/null
+++ b/tests/QtScriptTools/CMakeLists.txt
@@ -0,0 +1 @@
+PYSIDE_TEST(debugger_test.py)
diff --git a/tests/qtscripttools/debugger_test.py b/tests/QtScriptTools/debugger_test.py
index e525361..e525361 100644
--- a/tests/qtscripttools/debugger_test.py
+++ b/tests/QtScriptTools/debugger_test.py
diff --git a/tests/QtSql/CMakeLists.txt b/tests/QtSql/CMakeLists.txt
new file mode 100644
index 0000000..a944691
--- /dev/null
+++ b/tests/QtSql/CMakeLists.txt
@@ -0,0 +1 @@
+PYSIDE_TEST(qsqldatabaseandqueries_test.py)
diff --git a/tests/qtsql/qsqldatabaseandqueries_test.py b/tests/QtSql/qsqldatabaseandqueries_test.py
index 49f2209..49f2209 100755
--- a/tests/qtsql/qsqldatabaseandqueries_test.py
+++ b/tests/QtSql/qsqldatabaseandqueries_test.py
diff --git a/tests/QtSvg/CMakeLists.txt b/tests/QtSvg/CMakeLists.txt
new file mode 100644
index 0000000..6a9c9d5
--- /dev/null
+++ b/tests/QtSvg/CMakeLists.txt
@@ -0,0 +1 @@
+PYSIDE_TEST(qsvggenerator_test.py)
diff --git a/tests/qtsvg/qsvggenerator_test.py b/tests/QtSvg/qsvggenerator_test.py
index cec7fda..cec7fda 100644
--- a/tests/qtsvg/qsvggenerator_test.py
+++ b/tests/QtSvg/qsvggenerator_test.py
diff --git a/tests/QtTest/CMakeLists.txt b/tests/QtTest/CMakeLists.txt
new file mode 100644
index 0000000..b1bdac0
--- /dev/null
+++ b/tests/QtTest/CMakeLists.txt
@@ -0,0 +1,2 @@
+PYSIDE_TEST(click_test.py)
+PYSIDE_TEST(eventfilter_test.py)
diff --git a/tests/qttest/click_test.py b/tests/QtTest/click_test.py
index e295cee..e295cee 100644
--- a/tests/qttest/click_test.py
+++ b/tests/QtTest/click_test.py
diff --git a/tests/qttest/eventfilter_test.py b/tests/QtTest/eventfilter_test.py
index 382460e..382460e 100644
--- a/tests/qttest/eventfilter_test.py
+++ b/tests/QtTest/eventfilter_test.py
diff --git a/tests/QtUiTools/CMakeLists.txt b/tests/QtUiTools/CMakeLists.txt
new file mode 100644
index 0000000..9118b5b
--- /dev/null
+++ b/tests/QtUiTools/CMakeLists.txt
@@ -0,0 +1,2 @@
+PYSIDE_TEST(uiloader_test.py)
+PYSIDE_TEST(ui_test.py)
diff --git a/tests/qtuitools/test.ui b/tests/QtUiTools/test.ui
index 60afe22..60afe22 100644
--- a/tests/qtuitools/test.ui
+++ b/tests/QtUiTools/test.ui
diff --git a/tests/qtuitools/ui_test.py b/tests/QtUiTools/ui_test.py
index 6f599ce..6f599ce 100644
--- a/tests/qtuitools/ui_test.py
+++ b/tests/QtUiTools/ui_test.py
diff --git a/tests/qtuitools/uiloader_test.py b/tests/QtUiTools/uiloader_test.py
index fe3725b..fe3725b 100644
--- a/tests/qtuitools/uiloader_test.py
+++ b/tests/QtUiTools/uiloader_test.py
diff --git a/tests/QtWebKit/CMakeLists.txt b/tests/QtWebKit/CMakeLists.txt
new file mode 100644
index 0000000..5472865
--- /dev/null
+++ b/tests/QtWebKit/CMakeLists.txt
@@ -0,0 +1,2 @@
+PYSIDE_TEST(webpage_test.py)
+PYSIDE_TEST(webview_test.py)
diff --git a/tests/qtwebkit/fox.html b/tests/QtWebKit/fox.html
index e7691eb..e7691eb 100644
--- a/tests/qtwebkit/fox.html
+++ b/tests/QtWebKit/fox.html
diff --git a/tests/qtwebkit/webpage_test.py b/tests/QtWebKit/webpage_test.py
index 2079697..2079697 100644
--- a/tests/qtwebkit/webpage_test.py
+++ b/tests/QtWebKit/webpage_test.py
diff --git a/tests/qtwebkit/webview_test.py b/tests/QtWebKit/webview_test.py
index c06e437..c06e437 100644
--- a/tests/qtwebkit/webview_test.py
+++ b/tests/QtWebKit/webview_test.py
diff --git a/tests/QtXml/CMakeLists.txt b/tests/QtXml/CMakeLists.txt
new file mode 100644
index 0000000..2c21bf8
--- /dev/null
+++ b/tests/QtXml/CMakeLists.txt
@@ -0,0 +1,2 @@
+PYSIDE_TEST(qdomdocument_test.py)
+PYSIDE_TEST(qxmlsimplereader_test.py)
diff --git a/tests/qtxml/qdomdocument_test.py b/tests/QtXml/qdomdocument_test.py
index 86aece7..86aece7 100644
--- a/tests/qtxml/qdomdocument_test.py
+++ b/tests/QtXml/qdomdocument_test.py
diff --git a/tests/qtxml/qxmlsimplereader_test.py b/tests/QtXml/qxmlsimplereader_test.py
index 6c4d3f4..6c4d3f4 100644
--- a/tests/qtxml/qxmlsimplereader_test.py
+++ b/tests/QtXml/qxmlsimplereader_test.py
diff --git a/tests/QtXmlPatterns/CMakeLists.txt b/tests/QtXmlPatterns/CMakeLists.txt
new file mode 100644
index 0000000..7f570f1
--- /dev/null
+++ b/tests/QtXmlPatterns/CMakeLists.txt
@@ -0,0 +1 @@
+PYSIDE_TEST(import_test.py)
diff --git a/tests/qtxmlpatterns/import_test.py b/tests/QtXmlPatterns/import_test.py
index 5bab975..5bab975 100644
--- a/tests/qtxmlpatterns/import_test.py
+++ b/tests/QtXmlPatterns/import_test.py
diff --git a/tests/phonon/CMakeLists.txt b/tests/phonon/CMakeLists.txt
new file mode 100644
index 0000000..1174709
--- /dev/null
+++ b/tests/phonon/CMakeLists.txt
@@ -0,0 +1,2 @@
+PYSIDE_TEST(basic_playing_test.py)
+PYSIDE_TEST(capabilities_test.py)
diff --git a/tests/qtgui/qlabel_pixmap_refcount.py b/tests/qtgui/qlabel_pixmap_refcount.py
deleted file mode 100644
index db8783e..0000000
--- a/tests/qtgui/qlabel_pixmap_refcount.py
+++ /dev/null
@@ -1,46 +0,0 @@
-
-'''Test cases for QLabel->pixmap refcount control'''
-
-import unittest
-import sys
-
-
-from helper import UsesQApplication
-from PySide.QtGui import QApplication, QLabel, QPixmap
-
-class QLabelTest(UsesQApplication):
-    '''Test case for constructor of QBrush'''
-
-    def testDestroyOwner(self):
-        p = QPixmap()
-        l = QLabel()
-        l.setPixmap(p)
-
-        del p
-
-        p1 = l.pixmap()
-        self.assertEqual(sys.getrefcount(p1), 2)
-        self.assertEqual(sys.getrefcount(l), 2)
-
-        del l
-        self.assertEqual(sys.getrefcount(p1), 2)
-
-
-    def testRefCount(self):
-        p = QPixmap()
-        l = QLabel()
-        l.setPixmap(p)
-
-        del p
-
-        p1 = l.pixmap()
-        self.assertEqual(sys.getrefcount(p1), 2)
-
-        p2 = l.pixmap()
-        self.assertEqual(sys.getrefcount(p2), 3)
-
-        p3 = l.pixmap()
-        self.assertEqual(sys.getrefcount(p3), 4)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/run_test.sh b/tests/run_test.sh
index 8671ce3..363fae5 100755
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -1,13 +1,13 @@
-#!/usr/bin/python
+#!/bin/sh
 
 # This is a nasty workaround of a CTest limitation
 # of setting the environment variables for the test.
 
 # $1: LD_LIBRARY_PATH
-# $2: $PYTHON_PATH
+# $2: $PYTHONPATH
 # $3: python executable
 # $4: test file
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$1
-export PYTHONPATH=$PYTHONPATH:$2
+export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
+export PYTHONPATH=$2:$PYTHONPATH
 $3 $4
diff --git a/tests/signals/CMakeLists.txt b/tests/signals/CMakeLists.txt
new file mode 100644
index 0000000..3e59684
--- /dev/null
+++ b/tests/signals/CMakeLists.txt
@@ -0,0 +1,32 @@
+PYSIDE_TEST(args_dont_match_test.py)
+PYSIDE_TEST(decorators_test.py)
+PYSIDE_TEST(invalid_callback_test.py)
+PYSIDE_TEST(lambda_gui_test.py)
+PYSIDE_TEST(lambda_test.py)
+PYSIDE_TEST(multiple_connections_gui_test.py)
+PYSIDE_TEST(multiple_connections_test.py)
+PYSIDE_TEST(pysignal_test.py)
+PYSIDE_TEST(qobject_destroyed_test.py)
+PYSIDE_TEST(qobject_receivers_test.py)
+PYSIDE_TEST(qobject_sender_test.py)
+PYSIDE_TEST(ref01_test.py)
+PYSIDE_TEST(ref02_test.py)
+PYSIDE_TEST(ref03_test.py)
+PYSIDE_TEST(ref04_test.py)
+PYSIDE_TEST(ref05_test.py)
+PYSIDE_TEST(ref06_test.py)
+PYSIDE_TEST(segfault_proxyparent_test.py)
+PYSIDE_TEST(self_connect_test.py)
+PYSIDE_TEST(short_circuit_test.py)
+PYSIDE_TEST(signal2signal_connect_test.py)
+PYSIDE_TEST(signal_autoconnect_test.py)
+PYSIDE_TEST(signal_connectiontype_support.py)
+PYSIDE_TEST(signal_emission_gui_test.py)
+PYSIDE_TEST(signal_emission_test.py)
+PYSIDE_TEST(signal_func_test.py)
+PYSIDE_TEST(signal_manager_refcount_test.py)
+PYSIDE_TEST(signal_object_test.py)
+PYSIDE_TEST(signal_with_primitive_type_test.py)
+PYSIDE_TEST(slot_reference_count_test.py)
+PYSIDE_TEST(static_metaobject_test.py)
+PYSIDE_TEST(upstream_segfault_test.py)
diff --git a/tests/signals/args_dont_match_test.py b/tests/signals/args_dont_match_test.py
index b81c568..2521167 100644..100755
--- a/tests/signals/args_dont_match_test.py
+++ b/tests/signals/args_dont_match_test.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 
 import unittest
 from PySide.QtCore import *
diff --git a/tests/signals/decorators_test.py b/tests/signals/decorators_test.py
index db068d0..db068d0 100644..100755
--- a/tests/signals/decorators_test.py
+++ b/tests/signals/decorators_test.py
diff --git a/tests/signals/invalid_callback_test.py b/tests/signals/invalid_callback_test.py
index 3328bb5..3328bb5 100644..100755
--- a/tests/signals/invalid_callback_test.py
+++ b/tests/signals/invalid_callback_test.py
diff --git a/tests/signals/lambda_gui_test.py b/tests/signals/lambda_gui_test.py
index e842ae2..e842ae2 100644..100755
--- a/tests/signals/lambda_gui_test.py
+++ b/tests/signals/lambda_gui_test.py
diff --git a/tests/signals/lambda_test.py b/tests/signals/lambda_test.py
index dff743c..dff743c 100644..100755
--- a/tests/signals/lambda_test.py
+++ b/tests/signals/lambda_test.py
diff --git a/tests/signals/multiple_connections_gui_test.py b/tests/signals/multiple_connections_gui_test.py
index 72feac0..72feac0 100644..100755
--- a/tests/signals/multiple_connections_gui_test.py
+++ b/tests/signals/multiple_connections_gui_test.py
diff --git a/tests/signals/multiple_connections_test.py b/tests/signals/multiple_connections_test.py
index 5daeaab..5daeaab 100644..100755
--- a/tests/signals/multiple_connections_test.py
+++ b/tests/signals/multiple_connections_test.py
diff --git a/tests/signals/pysignal_test.py b/tests/signals/pysignal_test.py
index 7bb89a0..7bb89a0 100644..100755
--- a/tests/signals/pysignal_test.py
+++ b/tests/signals/pysignal_test.py
diff --git a/tests/signals/qobject_destroyed_test.py b/tests/signals/qobject_destroyed_test.py
index 01d1b58..01d1b58 100644..100755
--- a/tests/signals/qobject_destroyed_test.py
+++ b/tests/signals/qobject_destroyed_test.py
diff --git a/tests/signals/qobject_receivers_test.py b/tests/signals/qobject_receivers_test.py
index cb4c9ce..cb4c9ce 100644..100755
--- a/tests/signals/qobject_receivers_test.py
+++ b/tests/signals/qobject_receivers_test.py
diff --git a/tests/signals/segfault_proxyparent_test.py b/tests/signals/segfault_proxyparent_test.py
index 2b41f67..2b41f67 100644..100755
--- a/tests/signals/segfault_proxyparent_test.py
+++ b/tests/signals/segfault_proxyparent_test.py
diff --git a/tests/signals/self_connect_test.py b/tests/signals/self_connect_test.py
index f4d90c6..f4d90c6 100644..100755
--- a/tests/signals/self_connect_test.py
+++ b/tests/signals/self_connect_test.py
diff --git a/tests/signals/short_circuit_test.py b/tests/signals/short_circuit_test.py
index e36420c..e36420c 100644..100755
--- a/tests/signals/short_circuit_test.py
+++ b/tests/signals/short_circuit_test.py
diff --git a/tests/signals/signal2signal_connect_test.py b/tests/signals/signal2signal_connect_test.py
index bdc2328..bdc2328 100644..100755
--- a/tests/signals/signal2signal_connect_test.py
+++ b/tests/signals/signal2signal_connect_test.py
diff --git a/tests/signals/signal_autoconnect_test.py b/tests/signals/signal_autoconnect_test.py
index d3e7491..d3e7491 100644..100755
--- a/tests/signals/signal_autoconnect_test.py
+++ b/tests/signals/signal_autoconnect_test.py
diff --git a/tests/signals/signal_connectiontype_support.py b/tests/signals/signal_connectiontype_support.py
index d0c35c5..d0c35c5 100644..100755
--- a/tests/signals/signal_connectiontype_support.py
+++ b/tests/signals/signal_connectiontype_support.py
diff --git a/tests/signals/signal_emission_gui_test.py b/tests/signals/signal_emission_gui_test.py
index 6ae4ceb..6ae4ceb 100644..100755
--- a/tests/signals/signal_emission_gui_test.py
+++ b/tests/signals/signal_emission_gui_test.py
diff --git a/tests/signals/signal_emission_test.py b/tests/signals/signal_emission_test.py
index a8dd4fd..a8dd4fd 100644..100755
--- a/tests/signals/signal_emission_test.py
+++ b/tests/signals/signal_emission_test.py
diff --git a/tests/signals/signal_func_test.py b/tests/signals/signal_func_test.py
index 39bd1b2..39bd1b2 100644..100755
--- a/tests/signals/signal_func_test.py
+++ b/tests/signals/signal_func_test.py
diff --git a/tests/signals/signal_manager_refcount_test.py b/tests/signals/signal_manager_refcount_test.py
index 191ce9d..191ce9d 100644..100755
--- a/tests/signals/signal_manager_refcount_test.py
+++ b/tests/signals/signal_manager_refcount_test.py
diff --git a/tests/signals/signal_object_test.py b/tests/signals/signal_object_test.py
index 614c0e6..614c0e6 100644..100755
--- a/tests/signals/signal_object_test.py
+++ b/tests/signals/signal_object_test.py
diff --git a/tests/signals/signal_with_primitive_type_test.py b/tests/signals/signal_with_primitive_type_test.py
index 96ff353..96ff353 100644..100755
--- a/tests/signals/signal_with_primitive_type_test.py
+++ b/tests/signals/signal_with_primitive_type_test.py
diff --git a/tests/signals/slot_reference_count_test.py b/tests/signals/slot_reference_count_test.py
index 62037f2..62037f2 100644..100755
--- a/tests/signals/slot_reference_count_test.py
+++ b/tests/signals/slot_reference_count_test.py
diff --git a/tests/signals/static_metaobject_test.py b/tests/signals/static_metaobject_test.py
index bce711f..bce711f 100644..100755
--- a/tests/signals/static_metaobject_test.py
+++ b/tests/signals/static_metaobject_test.py
diff --git a/tests/signals/upstream_segfault_test.py b/tests/signals/upstream_segfault_test.py
index 793b04b..793b04b 100644..100755
--- a/tests/signals/upstream_segfault_test.py
+++ b/tests/signals/upstream_segfault_test.py