From: Stephen Kelly Date: Fri, 22 Jun 2012 08:04:05 +0000 (+0200) Subject: Give the CMake unit tests more meaningful names. X-Git-Tag: 071012110112~286 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2af438a6ce31f225f0d1c0b1b43df848a858fe18;p=profile%2Fivi%2Fqtbase.git Give the CMake unit tests more meaningful names. Change-Id: I0a54d32ec62ff6daf7672d0aabdeb038f4c7c78f Reviewed-by: David Faure --- diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index d8c4182..7195a3d 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -1,6 +1,6 @@ # This is an automatic test for the CMake configuration files. -# To run it, +# To run it manually, # 1) mkdir build # Create a build directory # 2) cd build # 3) cmake .. # Run cmake on this directory. @@ -8,20 +8,29 @@ # # The expected output is something like: # -# Start 1: pass1 -# 1/7 Test #1: pass1 ............................ Passed 4.25 sec -# Start 2: pass2 -# 2/7 Test #2: pass2 ............................ Passed 2.00 sec -# Start 3: pass3 -# 3/7 Test #3: pass3 ............................ Passed 2.85 sec -# Start 4: fail4 -# 4/7 Test #4: fail4 ............................ Passed 1.88 sec -# Start 5: fail5 -# 5/7 Test #5: fail5 ............................ Passed 1.36 sec -# Start 6: pass_needsquoting_6 -# 6/7 Test #6: pass_needsquoting_6 .............. Passed 2.88 sec -# Start 7: pass7 -# 7/7 Test #7: pass7 ............................ Passed 0.93 sec +# Start 1: test_use_modules_function +# 1/11 Test #1: test_use_modules_function ........ Passed 3.36 sec +# Start 2: test_wrap_cpp_and_resources +# 2/11 Test #2: test_wrap_cpp_and_resources ...... Passed 1.41 sec +# Start 3: test_dependent_modules +# 3/11 Test #3: test_dependent_modules ........... Passed 2.22 sec +# Start 4: test_add_resource_options +# 4/11 Test #4: test_add_resource_options ........ Passed 0.16 sec +# Start 5: test_wrap_cpp_options +# 5/11 Test #5: test_wrap_cpp_options ............ Passed 0.36 sec +# Start 6: test_needsquoting_dirname +# 6/11 Test #6: test_needsquoting_dirname ........ Passed 2.20 sec +# Start 7: test_platform_defs_include +# 7/11 Test #7: test_platform_defs_include ....... Passed 0.28 sec +# Start 8: test_qtmainwin_library +# 8/11 Test #8: test_qtmainwin_library ........... Passed 1.27 sec +# Start 9: test_dbus_module +# 9/11 Test #9: test_dbus_module ................. Passed 3.46 sec +# Start 10: test_multiple_find_package +# 10/11 Test #10: test_multiple_find_package ....... Passed 0.07 sec +# Start 11: test_add_resources_delyed_file +# 11/11 Test #11: test_add_resources_delyed_file ... Passed 0.38 sec +# # # Note that if Qt is not installed, or if it is installed to a # non-standard prefix, the environment variable CMAKE_PREFIX_PATH @@ -80,22 +89,22 @@ endmacro() if(NOT ${CMAKE_VERSION} VERSION_LESS 2.8.8) # Requires INCLUDE_DIRECTORIES target property in CMake 2.8.8 - expect_pass(pass1) + expect_pass(test_use_modules_function) else() - message("CMake version older than 2.8.8 (Found ${CMAKE_VERSION}). Not running test \"pass1\"") + message("CMake version older than 2.8.8 (Found ${CMAKE_VERSION}). Not running test \"test_use_modules_function\"") endif() -expect_pass(pass2) -expect_pass(pass3) -expect_fail(fail4) -expect_fail(fail5) -expect_pass("pass(needsquoting)6") -expect_pass(pass7) -expect_pass(pass8) +expect_pass(test_wrap_cpp_and_resources) +expect_pass(test_dependent_modules) +expect_fail(test_add_resource_options) +expect_fail(test_wrap_cpp_options) +expect_pass("test(needsquoting)dirname") +expect_pass(test_platform_defs_include) +expect_pass(test_qtmainwin_library) # If QtDBus has been installed then run the tests for its macros. find_package(Qt5DBus QUIET) if (Qt5DBus_FOUND AND NOT APPLE) - expect_pass(pass9) + expect_pass(test_dbus_module) endif() -expect_pass(pass10) -expect_pass(pass11) +expect_pass(test_multiple_find_package) +expect_pass(test_add_resources_delyed_file) diff --git a/tests/auto/cmake/pass11/CMakeLists.txt b/tests/auto/cmake/pass11/CMakeLists.txt deleted file mode 100644 index 0e9d028..0000000 --- a/tests/auto/cmake/pass11/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(pass11) - -find_package(Qt5Core REQUIRED) - -include_directories(${Qt5Core_INCLUDE_DIRS}) - -add_definitions(${Qt5Core_DEFINITIONS}) - -qt5_add_resources(rcc_files "${CMAKE_CURRENT_BINARY_DIR}/pass11.qrc") - -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pass11.qrc" " - - ${CMAKE_CURRENT_SOURCE_DIR}/resource_file.txt - - -") - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - -add_executable(pass11 main.cpp ${rcc_files}) -target_link_libraries(pass11 ${Qt5Core_LIBRARIES}) diff --git a/tests/auto/cmake/pass(needsquoting)6/CMakeLists.txt b/tests/auto/cmake/test(needsquoting)dirname/CMakeLists.txt similarity index 93% rename from tests/auto/cmake/pass(needsquoting)6/CMakeLists.txt rename to tests/auto/cmake/test(needsquoting)dirname/CMakeLists.txt index 63f675d..12ce93c 100644 --- a/tests/auto/cmake/pass(needsquoting)6/CMakeLists.txt +++ b/tests/auto/cmake/test(needsquoting)dirname/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) -project("pass(needsquoting)6") +project("test(needsquoting)dirname") find_package(Qt5Core REQUIRED) find_package(Qt5Gui REQUIRED) diff --git a/tests/auto/cmake/pass3/mywidget.cpp b/tests/auto/cmake/test(needsquoting)dirname/mywidget.cpp similarity index 100% rename from tests/auto/cmake/pass3/mywidget.cpp rename to tests/auto/cmake/test(needsquoting)dirname/mywidget.cpp diff --git a/tests/auto/cmake/pass3/mywidget.h b/tests/auto/cmake/test(needsquoting)dirname/mywidget.h similarity index 100% rename from tests/auto/cmake/pass3/mywidget.h rename to tests/auto/cmake/test(needsquoting)dirname/mywidget.h diff --git a/tests/auto/cmake/pass3/mywidget.ui b/tests/auto/cmake/test(needsquoting)dirname/mywidget.ui similarity index 100% rename from tests/auto/cmake/pass3/mywidget.ui rename to tests/auto/cmake/test(needsquoting)dirname/mywidget.ui diff --git a/tests/auto/cmake/fail4/CMakeLists.txt b/tests/auto/cmake/test_add_resource_options/CMakeLists.txt similarity index 84% rename from tests/auto/cmake/fail4/CMakeLists.txt rename to tests/auto/cmake/test_add_resource_options/CMakeLists.txt index fdf90e1..e79b954 100644 --- a/tests/auto/cmake/fail4/CMakeLists.txt +++ b/tests/auto/cmake/test_add_resource_options/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) -project(pass4) +project(test_add_resource_options) find_package(Qt5Core REQUIRED) @@ -14,7 +14,7 @@ qt5_wrap_cpp(moc_files myobject.h) # Test options. The -binary option generates a binary to dlopen instead of # a source file to compile. The compiler will consider it garbage when used # in the add_executable call. -qt5_add_resources(rcc_files "pass4.qrc" OPTIONS -binary) +qt5_add_resources(rcc_files "test_macro_options.qrc" OPTIONS -binary) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") diff --git a/tests/auto/cmake/fail5/myobject.cpp b/tests/auto/cmake/test_add_resource_options/myobject.cpp similarity index 100% rename from tests/auto/cmake/fail5/myobject.cpp rename to tests/auto/cmake/test_add_resource_options/myobject.cpp diff --git a/tests/auto/cmake/pass2/myobject.h b/tests/auto/cmake/test_add_resource_options/myobject.h similarity index 100% rename from tests/auto/cmake/pass2/myobject.h rename to tests/auto/cmake/test_add_resource_options/myobject.h diff --git a/tests/auto/cmake/pass2/resource_file.txt b/tests/auto/cmake/test_add_resource_options/resource_file.txt similarity index 100% rename from tests/auto/cmake/pass2/resource_file.txt rename to tests/auto/cmake/test_add_resource_options/resource_file.txt diff --git a/tests/auto/cmake/pass2/pass2.qrc b/tests/auto/cmake/test_add_resource_options/test_macro_options.qrc similarity index 100% rename from tests/auto/cmake/pass2/pass2.qrc rename to tests/auto/cmake/test_add_resource_options/test_macro_options.qrc diff --git a/tests/auto/cmake/test_add_resources_delyed_file/CMakeLists.txt b/tests/auto/cmake/test_add_resources_delyed_file/CMakeLists.txt new file mode 100644 index 0000000..a64f168 --- /dev/null +++ b/tests/auto/cmake/test_add_resources_delyed_file/CMakeLists.txt @@ -0,0 +1,24 @@ + +cmake_minimum_required(VERSION 2.8) + +project(test_add_resources_delyed_file) + +find_package(Qt5Core REQUIRED) + +include_directories(${Qt5Core_INCLUDE_DIRS}) + +add_definitions(${Qt5Core_DEFINITIONS}) + +qt5_add_resources(rcc_files "${CMAKE_CURRENT_BINARY_DIR}/test_add_resources_delyed_file.qrc") + +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_add_resources_delyed_file.qrc" " + + ${CMAKE_CURRENT_SOURCE_DIR}/resource_file.txt + + +") + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") + +add_executable(test_add_resources_delyed_file main.cpp ${rcc_files}) +target_link_libraries(test_add_resources_delyed_file ${Qt5Core_LIBRARIES}) diff --git a/tests/auto/cmake/pass11/main.cpp b/tests/auto/cmake/test_add_resources_delyed_file/main.cpp similarity index 97% rename from tests/auto/cmake/pass11/main.cpp rename to tests/auto/cmake/test_add_resources_delyed_file/main.cpp index 2a43be4..7b45dc2 100644 --- a/tests/auto/cmake/pass11/main.cpp +++ b/tests/auto/cmake/test_add_resources_delyed_file/main.cpp @@ -44,6 +44,6 @@ int main(int argc, char **argv) { // Compile error if the resource file was not created. - Q_INIT_RESOURCE(pass11); + Q_INIT_RESOURCE(test_add_resources_delyed_file); return 0; } diff --git a/tests/auto/cmake/pass11/resource_file.txt b/tests/auto/cmake/test_add_resources_delyed_file/resource_file.txt similarity index 100% rename from tests/auto/cmake/pass11/resource_file.txt rename to tests/auto/cmake/test_add_resources_delyed_file/resource_file.txt diff --git a/tests/auto/cmake/pass9/CMakeLists.txt b/tests/auto/cmake/test_dbus_module/CMakeLists.txt similarity index 96% rename from tests/auto/cmake/pass9/CMakeLists.txt rename to tests/auto/cmake/test_dbus_module/CMakeLists.txt index bf8ff6b..6bbb526 100644 --- a/tests/auto/cmake/pass9/CMakeLists.txt +++ b/tests/auto/cmake/test_dbus_module/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) -project(pass9) +project(test_dbus_module) find_package(Qt5Core REQUIRED) find_package(Qt5DBus REQUIRED) diff --git a/tests/auto/cmake/pass9/mydbusobject.cpp b/tests/auto/cmake/test_dbus_module/mydbusobject.cpp similarity index 100% rename from tests/auto/cmake/pass9/mydbusobject.cpp rename to tests/auto/cmake/test_dbus_module/mydbusobject.cpp diff --git a/tests/auto/cmake/pass9/mydbusobject.h b/tests/auto/cmake/test_dbus_module/mydbusobject.h similarity index 100% rename from tests/auto/cmake/pass9/mydbusobject.h rename to tests/auto/cmake/test_dbus_module/mydbusobject.h diff --git a/tests/auto/cmake/pass3/CMakeLists.txt b/tests/auto/cmake/test_dependent_modules/CMakeLists.txt similarity index 94% rename from tests/auto/cmake/pass3/CMakeLists.txt rename to tests/auto/cmake/test_dependent_modules/CMakeLists.txt index 7fa6731..07f202b 100644 --- a/tests/auto/cmake/pass3/CMakeLists.txt +++ b/tests/auto/cmake/test_dependent_modules/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) -project(pass3) +project(test_dependent_modules) # The module finds its dependencies find_package(Qt5Widgets REQUIRED) diff --git a/tests/auto/cmake/pass(needsquoting)6/mywidget.cpp b/tests/auto/cmake/test_dependent_modules/mywidget.cpp similarity index 100% rename from tests/auto/cmake/pass(needsquoting)6/mywidget.cpp rename to tests/auto/cmake/test_dependent_modules/mywidget.cpp diff --git a/tests/auto/cmake/pass(needsquoting)6/mywidget.h b/tests/auto/cmake/test_dependent_modules/mywidget.h similarity index 100% rename from tests/auto/cmake/pass(needsquoting)6/mywidget.h rename to tests/auto/cmake/test_dependent_modules/mywidget.h diff --git a/tests/auto/cmake/pass(needsquoting)6/mywidget.ui b/tests/auto/cmake/test_dependent_modules/mywidget.ui similarity index 100% rename from tests/auto/cmake/pass(needsquoting)6/mywidget.ui rename to tests/auto/cmake/test_dependent_modules/mywidget.ui diff --git a/tests/auto/cmake/pass10/CMakeLists.txt b/tests/auto/cmake/test_multiple_find_package/CMakeLists.txt similarity index 73% rename from tests/auto/cmake/pass10/CMakeLists.txt rename to tests/auto/cmake/test_multiple_find_package/CMakeLists.txt index bd7051a..dfac4ca 100644 --- a/tests/auto/cmake/pass10/CMakeLists.txt +++ b/tests/auto/cmake/test_multiple_find_package/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) -project(pass10) +project(test_multiple_find_package) find_package(Qt5Core REQUIRED) diff --git a/tests/auto/cmake/pass10/subdir1/CMakeLists.txt b/tests/auto/cmake/test_multiple_find_package/subdir1/CMakeLists.txt similarity index 100% rename from tests/auto/cmake/pass10/subdir1/CMakeLists.txt rename to tests/auto/cmake/test_multiple_find_package/subdir1/CMakeLists.txt diff --git a/tests/auto/cmake/pass7/CMakeLists.txt b/tests/auto/cmake/test_platform_defs_include/CMakeLists.txt similarity index 88% rename from tests/auto/cmake/pass7/CMakeLists.txt rename to tests/auto/cmake/test_platform_defs_include/CMakeLists.txt index ecf6b36..2b32a41 100644 --- a/tests/auto/cmake/pass7/CMakeLists.txt +++ b/tests/auto/cmake/test_platform_defs_include/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) -project(pass7) +project(test_platform_defs_include) find_package(Qt5Core REQUIRED) diff --git a/tests/auto/cmake/pass7/main.cpp b/tests/auto/cmake/test_platform_defs_include/main.cpp similarity index 100% rename from tests/auto/cmake/pass7/main.cpp rename to tests/auto/cmake/test_platform_defs_include/main.cpp diff --git a/tests/auto/cmake/pass8/CMakeLists.txt b/tests/auto/cmake/test_qtmainwin_library/CMakeLists.txt similarity index 95% rename from tests/auto/cmake/pass8/CMakeLists.txt rename to tests/auto/cmake/test_qtmainwin_library/CMakeLists.txt index 735b1bd..40ccb41 100644 --- a/tests/auto/cmake/pass8/CMakeLists.txt +++ b/tests/auto/cmake/test_qtmainwin_library/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) -project(pass8) +project(test_qtmainwin_library) find_package(Qt5Core REQUIRED) diff --git a/tests/auto/cmake/pass8/myobject.cpp b/tests/auto/cmake/test_qtmainwin_library/myobject.cpp similarity index 100% rename from tests/auto/cmake/pass8/myobject.cpp rename to tests/auto/cmake/test_qtmainwin_library/myobject.cpp diff --git a/tests/auto/cmake/pass8/myobject.h b/tests/auto/cmake/test_qtmainwin_library/myobject.h similarity index 100% rename from tests/auto/cmake/pass8/myobject.h rename to tests/auto/cmake/test_qtmainwin_library/myobject.h diff --git a/tests/auto/cmake/pass1/CMakeLists.txt b/tests/auto/cmake/test_use_modules_function/CMakeLists.txt similarity index 87% rename from tests/auto/cmake/pass1/CMakeLists.txt rename to tests/auto/cmake/test_use_modules_function/CMakeLists.txt index 50a3375..4ce0193 100644 --- a/tests/auto/cmake/pass1/CMakeLists.txt +++ b/tests/auto/cmake/test_use_modules_function/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) -project(pass1) +project(test_use_modules_function) set(CMAKE_AUTOMOC ON) diff --git a/tests/auto/cmake/pass1/three.cpp b/tests/auto/cmake/test_use_modules_function/three.cpp similarity index 100% rename from tests/auto/cmake/pass1/three.cpp rename to tests/auto/cmake/test_use_modules_function/three.cpp diff --git a/tests/auto/cmake/pass1/two.cpp b/tests/auto/cmake/test_use_modules_function/two.cpp similarity index 100% rename from tests/auto/cmake/pass1/two.cpp rename to tests/auto/cmake/test_use_modules_function/two.cpp diff --git a/tests/auto/cmake/pass2/CMakeLists.txt b/tests/auto/cmake/test_wrap_cpp_and_resources/CMakeLists.txt similarity index 79% rename from tests/auto/cmake/pass2/CMakeLists.txt rename to tests/auto/cmake/test_wrap_cpp_and_resources/CMakeLists.txt index c859f13..316a4e4 100644 --- a/tests/auto/cmake/pass2/CMakeLists.txt +++ b/tests/auto/cmake/test_wrap_cpp_and_resources/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) -project(pass2) +project(test_wrap_cpp_and_resources) find_package(Qt5Core REQUIRED) @@ -11,7 +11,7 @@ add_definitions(${Qt5Core_DEFINITIONS}) qt5_wrap_cpp(moc_files myobject.h) -qt5_add_resources(rcc_files "pass2.qrc") +qt5_add_resources(rcc_files "test_wrap_cpp_and_resources.qrc") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") diff --git a/tests/auto/cmake/pass2/myobject.cpp b/tests/auto/cmake/test_wrap_cpp_and_resources/myobject.cpp similarity index 97% rename from tests/auto/cmake/pass2/myobject.cpp rename to tests/auto/cmake/test_wrap_cpp_and_resources/myobject.cpp index a237b00..8f02720 100644 --- a/tests/auto/cmake/pass2/myobject.cpp +++ b/tests/auto/cmake/test_wrap_cpp_and_resources/myobject.cpp @@ -51,6 +51,6 @@ int main(int argc, char **argv) { MyObject myObject; // Compile error if the resource file was not created. - Q_INIT_RESOURCE(pass2); + Q_INIT_RESOURCE(test_wrap_cpp_and_resources); return 0; } diff --git a/tests/auto/cmake/fail5/myobject.h b/tests/auto/cmake/test_wrap_cpp_and_resources/myobject.h similarity index 100% rename from tests/auto/cmake/fail5/myobject.h rename to tests/auto/cmake/test_wrap_cpp_and_resources/myobject.h diff --git a/tests/auto/cmake/fail4/resource_file.txt b/tests/auto/cmake/test_wrap_cpp_and_resources/resource_file.txt similarity index 100% rename from tests/auto/cmake/fail4/resource_file.txt rename to tests/auto/cmake/test_wrap_cpp_and_resources/resource_file.txt diff --git a/tests/auto/cmake/fail4/pass4.qrc b/tests/auto/cmake/test_wrap_cpp_and_resources/test_wrap_cpp_and_resources.qrc similarity index 100% rename from tests/auto/cmake/fail4/pass4.qrc rename to tests/auto/cmake/test_wrap_cpp_and_resources/test_wrap_cpp_and_resources.qrc diff --git a/tests/auto/cmake/fail5/CMakeLists.txt b/tests/auto/cmake/test_wrap_cpp_options/CMakeLists.txt similarity index 94% rename from tests/auto/cmake/fail5/CMakeLists.txt rename to tests/auto/cmake/test_wrap_cpp_options/CMakeLists.txt index 962314c..a7a2c0e 100644 --- a/tests/auto/cmake/fail5/CMakeLists.txt +++ b/tests/auto/cmake/test_wrap_cpp_options/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) -project(pass5) +project(test_wrap_cpp_options) find_package(Qt5Core REQUIRED) diff --git a/tests/auto/cmake/fail4/myobject.cpp b/tests/auto/cmake/test_wrap_cpp_options/myobject.cpp similarity index 100% rename from tests/auto/cmake/fail4/myobject.cpp rename to tests/auto/cmake/test_wrap_cpp_options/myobject.cpp diff --git a/tests/auto/cmake/fail4/myobject.h b/tests/auto/cmake/test_wrap_cpp_options/myobject.h similarity index 100% rename from tests/auto/cmake/fail4/myobject.h rename to tests/auto/cmake/test_wrap_cpp_options/myobject.h