aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.lima@openbossa.org>2010-06-08 11:17:48 -0300
committerHugo Parente Lima <hugo.lima@openbossa.org>2010-06-10 15:31:43 -0300
commite47b49f86d63845fe214768838c4fc7c55e3012a (patch)
treecd2f2c85dcd7a7fe6a17408c34246900cd7606e0 /tests
parent00918cb847dfa1b28acb791c66cb444bc2123f79 (diff)
Re-add the possibility to run tests by module.
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt5
-rw-r--r--tests/QtCore/CMakeLists.txt3
-rw-r--r--tests/QtCore/thread_signals_test.py (renamed from tests/QtCore/thread_signals.py)0
-rw-r--r--tests/QtGui/CMakeLists.txt4
-rw-r--r--tests/QtGui/virtual_pure_override_test.py (renamed from tests/QtGui/virtual_pure_override.py)0
-rw-r--r--tests/QtGui/x11_symbols_test.py (renamed from tests/QtGui/x11_symbols.py)0
-rw-r--r--tests/QtScript/CMakeLists.txt1
-rw-r--r--tests/QtScript/test_base.py4
-rw-r--r--tests/signals/CMakeLists.txt2
-rwxr-xr-xtests/signals/signal_connectiontype_support_test.py (renamed from tests/signals/signal_connectiontype_support.py)0
10 files changed, 7 insertions, 12 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d87414fd..d446151d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,7 +7,8 @@ macro(TEST_QT_MODULE var name)
endmacro(TEST_QT_MODULE)
macro(PYSIDE_TEST)
- set(TEST_NAME ${ARGV0})
+ string(REGEX MATCH "/([^/]+)//?([^/]+)\\.py" foo "${CMAKE_CURRENT_SOURCE_DIR}/${ARGV0}" )
+ set(TEST_NAME "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}")
if (${ARGC} EQUAL 1)
set(EXPECT_TO_FAIL 0)
elseif(${ARGC} EQUAL 2)
@@ -15,7 +16,7 @@ macro(PYSIDE_TEST)
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}")
+ 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}/${ARGV0}")
add_test(${TEST_NAME} ${TEST_CMD})
set_tests_properties(${TEST_NAME} PROPERTIES
TIMEOUT ${PYSIDE_TIMEOUT}
diff --git a/tests/QtCore/CMakeLists.txt b/tests/QtCore/CMakeLists.txt
index 4a78bf6a..cce1332c 100644
--- a/tests/QtCore/CMakeLists.txt
+++ b/tests/QtCore/CMakeLists.txt
@@ -57,10 +57,9 @@ 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(thread_signals_test.py)
PYSIDE_TEST(translation_test.py)
PYSIDE_TEST(unaryoperator_test.py)
PYSIDE_TEST(unicode_test.py)
diff --git a/tests/QtCore/thread_signals.py b/tests/QtCore/thread_signals_test.py
index 9eea8290..9eea8290 100644
--- a/tests/QtCore/thread_signals.py
+++ b/tests/QtCore/thread_signals_test.py
diff --git a/tests/QtGui/CMakeLists.txt b/tests/QtGui/CMakeLists.txt
index fb6d8015..fa5de4a2 100644
--- a/tests/QtGui/CMakeLists.txt
+++ b/tests/QtGui/CMakeLists.txt
@@ -53,6 +53,6 @@ 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(virtual_pure_override_test.py)
PYSIDE_TEST(wrong_return_test.py)
-PYSIDE_TEST(x11_symbols.py)
+PYSIDE_TEST(x11_symbols_test.py)
diff --git a/tests/QtGui/virtual_pure_override.py b/tests/QtGui/virtual_pure_override_test.py
index c496e490..c496e490 100644
--- a/tests/QtGui/virtual_pure_override.py
+++ b/tests/QtGui/virtual_pure_override_test.py
diff --git a/tests/QtGui/x11_symbols.py b/tests/QtGui/x11_symbols_test.py
index 29cce150..29cce150 100644
--- a/tests/QtGui/x11_symbols.py
+++ b/tests/QtGui/x11_symbols_test.py
diff --git a/tests/QtScript/CMakeLists.txt b/tests/QtScript/CMakeLists.txt
index b76a2629..e496591c 100644
--- a/tests/QtScript/CMakeLists.txt
+++ b/tests/QtScript/CMakeLists.txt
@@ -1,3 +1,2 @@
PYSIDE_TEST(base_test.py)
PYSIDE_TEST(engine_test.py)
-PYSIDE_TEST(test_base.py)
diff --git a/tests/QtScript/test_base.py b/tests/QtScript/test_base.py
deleted file mode 100644
index 6ad27e00..00000000
--- a/tests/QtScript/test_base.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from PySide import QtScript
-
-
-#only test if the module import works fine bug #278
diff --git a/tests/signals/CMakeLists.txt b/tests/signals/CMakeLists.txt
index 3e596844..a6d564ff 100644
--- a/tests/signals/CMakeLists.txt
+++ b/tests/signals/CMakeLists.txt
@@ -20,7 +20,7 @@ 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_connectiontype_support_test.py)
PYSIDE_TEST(signal_emission_gui_test.py)
PYSIDE_TEST(signal_emission_test.py)
PYSIDE_TEST(signal_func_test.py)
diff --git a/tests/signals/signal_connectiontype_support.py b/tests/signals/signal_connectiontype_support_test.py
index d0c35c53..d0c35c53 100755
--- a/tests/signals/signal_connectiontype_support.py
+++ b/tests/signals/signal_connectiontype_support_test.py