From de54277a5fca412232a166928233861106c99f7a Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 14 Nov 2008 20:45:30 +0000 Subject: -add a test for FindQCA2.cmake -add a macro test_find_package( ...) for executing a mdoule and printing the results -add cmake script RunAllModuleTests.cmake which can be used to run all existing tests in one go Alex svn path=/trunk/KDE/kdelibs/; revision=884395 --- modules-tests/RunAllModuleTests.cmake | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 modules-tests/RunAllModuleTests.cmake (limited to 'modules-tests/RunAllModuleTests.cmake') diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake new file mode 100644 index 00000000..537072c1 --- /dev/null +++ b/modules-tests/RunAllModuleTests.cmake @@ -0,0 +1,20 @@ +# run this script via "cmake -P RunAllModuletests.cmake" to +# execute all module tests in one go. +# To see only the results and not the other cmake output, +# you can grep for ">>". + +get_filename_component(currentDir "${CMAKE_CURRENT_LIST_FILE}" PATH) + +function(execute_one_test name) + set(workingDir "${currentDir}/${name}/build") + file(REMOVE_RECURSE "${workingDir}") + file(MAKE_DIRECTORY "${workingDir}") + execute_process(COMMAND ${CMAKE_COMMAND} "${currentDir}/${name}" + WORKING_DIRECTORY "${workingDir}") +endfunction(execute_one_test) + +execute_one_test(Xine) +execute_one_test(Flex) +execute_one_test(QCA2) + + -- cgit v1.2.1 From f56b4fe57bccfb3bc5611bf75c8fb54c02bcd48c Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 14 Nov 2008 20:55:01 +0000 Subject: -add a test for FindBlitz.cmake -change output prefix from ">>" to "::" (doesn't have to be quoted when grepping) -add option CLEAN_DIRS to RunAllModuleTests.cmake, if you set this to TRUE, the previous test build directories will be removed before running the tests Alex svn path=/trunk/KDE/kdelibs/; revision=884400 --- modules-tests/RunAllModuleTests.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'modules-tests/RunAllModuleTests.cmake') diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake index 537072c1..3e529a96 100644 --- a/modules-tests/RunAllModuleTests.cmake +++ b/modules-tests/RunAllModuleTests.cmake @@ -1,13 +1,16 @@ # run this script via "cmake -P RunAllModuletests.cmake" to # execute all module tests in one go. # To see only the results and not the other cmake output, -# you can grep for ">>". +# you can grep for "::". +# To have it delete the previous test build dirs, run it with -DCLEAN_DIRS=TRUE get_filename_component(currentDir "${CMAKE_CURRENT_LIST_FILE}" PATH) function(execute_one_test name) set(workingDir "${currentDir}/${name}/build") - file(REMOVE_RECURSE "${workingDir}") + if(CLEAN_DIRS) + file(REMOVE_RECURSE "${workingDir}") + endif(CLEAN_DIRS) file(MAKE_DIRECTORY "${workingDir}") execute_process(COMMAND ${CMAKE_COMMAND} "${currentDir}/${name}" WORKING_DIRECTORY "${workingDir}") @@ -16,5 +19,6 @@ endfunction(execute_one_test) execute_one_test(Xine) execute_one_test(Flex) execute_one_test(QCA2) +execute_one_test(Blitz) -- cgit v1.2.1 From b46c76acad12c8d752dc51a56eec295229e1eb43 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 14 Nov 2008 21:42:16 +0000 Subject: add test for Eigen2 Alex svn path=/trunk/KDE/kdelibs/; revision=884414 --- modules-tests/RunAllModuleTests.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'modules-tests/RunAllModuleTests.cmake') diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake index 3e529a96..dbff28e8 100644 --- a/modules-tests/RunAllModuleTests.cmake +++ b/modules-tests/RunAllModuleTests.cmake @@ -16,9 +16,8 @@ function(execute_one_test name) WORKING_DIRECTORY "${workingDir}") endfunction(execute_one_test) -execute_one_test(Xine) +execute_one_test(Blitz) +execute_one_test(Eigen2) execute_one_test(Flex) execute_one_test(QCA2) -execute_one_test(Blitz) - - +execute_one_test(Xine) -- cgit v1.2.1 From 2134a85e5587f386f75934ec936f640fd5384216 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 14 Nov 2008 21:45:54 +0000 Subject: add test for FLAC Alex svn path=/trunk/KDE/kdelibs/; revision=884417 --- modules-tests/RunAllModuleTests.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules-tests/RunAllModuleTests.cmake') diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake index dbff28e8..9b58959c 100644 --- a/modules-tests/RunAllModuleTests.cmake +++ b/modules-tests/RunAllModuleTests.cmake @@ -19,5 +19,6 @@ endfunction(execute_one_test) execute_one_test(Blitz) execute_one_test(Eigen2) execute_one_test(Flex) +execute_one_test(Flac) execute_one_test(QCA2) execute_one_test(Xine) -- cgit v1.2.1 From 1e0f7b9bfdf023838b0157ca11fdb65d476e7818 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 16 Nov 2008 16:47:43 +0000 Subject: test the modules one with and once without pkg-config Alex svn path=/trunk/KDE/kdelibs/; revision=885115 --- modules-tests/RunAllModuleTests.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'modules-tests/RunAllModuleTests.cmake') diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake index 9b58959c..31198c50 100644 --- a/modules-tests/RunAllModuleTests.cmake +++ b/modules-tests/RunAllModuleTests.cmake @@ -14,6 +14,14 @@ function(execute_one_test name) file(MAKE_DIRECTORY "${workingDir}") execute_process(COMMAND ${CMAKE_COMMAND} "${currentDir}/${name}" WORKING_DIRECTORY "${workingDir}") + # now the same with pkg-config disabled + set(workingDir "${currentDir}/${name}/build-no-pkgconfig") + if(CLEAN_DIRS) + file(REMOVE_RECURSE "${workingDir}") + endif(CLEAN_DIRS) + file(MAKE_DIRECTORY "${workingDir}") + execute_process(COMMAND ${CMAKE_COMMAND} -DPKG_CONFIG_EXECUTABLE=echo "${currentDir}/${name}" + WORKING_DIRECTORY "${workingDir}") endfunction(execute_one_test) execute_one_test(Blitz) -- cgit v1.2.1 From 61ecb1d7e50e0ccc0c1f062a9d90f5763b9ea0fb Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 16 Nov 2008 18:55:35 +0000 Subject: add a test for strigi 0.6.0 Alex svn path=/trunk/KDE/kdelibs/; revision=885198 --- modules-tests/RunAllModuleTests.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules-tests/RunAllModuleTests.cmake') diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake index 31198c50..c388423a 100644 --- a/modules-tests/RunAllModuleTests.cmake +++ b/modules-tests/RunAllModuleTests.cmake @@ -29,4 +29,5 @@ execute_one_test(Eigen2) execute_one_test(Flex) execute_one_test(Flac) execute_one_test(QCA2) +execute_one_test(Strigi) execute_one_test(Xine) -- cgit v1.2.1 From 2272394b6ef05df4c4e8996b09aba0d411f249fc Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 2 Dec 2008 21:36:37 +0000 Subject: -add simple tests for more Find-modules -add support -DMODULE= to test only one module (both with and without pkgconfig) Alex svn path=/trunk/KDE/kdelibs/; revision=891797 --- modules-tests/RunAllModuleTests.cmake | 36 ++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'modules-tests/RunAllModuleTests.cmake') diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake index c388423a..e523227b 100644 --- a/modules-tests/RunAllModuleTests.cmake +++ b/modules-tests/RunAllModuleTests.cmake @@ -24,10 +24,32 @@ function(execute_one_test name) WORKING_DIRECTORY "${workingDir}") endfunction(execute_one_test) -execute_one_test(Blitz) -execute_one_test(Eigen2) -execute_one_test(Flex) -execute_one_test(Flac) -execute_one_test(QCA2) -execute_one_test(Strigi) -execute_one_test(Xine) +if(DEFINED MODULE) + set(modulesToTest ${MODULE}) +else(DEFINED MODULE) + set(modulesToTest AGG + Blitz + BlueZ + Eigen2 + Flac + Flex + GObject + GStreamer + LCMS + LibArt + LibXslt + OpenEXR + PCRE + QCA2 + QImageBlitz + Sqlite + Strigi + USB + Xine + Xmms) +endif(DEFINED MODULE) + +foreach(currentModule ${modulesToTest}) + execute_one_test(${currentModule}) +endforeach(currentModule ${modulesToTest}) + -- cgit v1.2.1 From 3d781e4e0c12d4cf1296403d176c416a09f47852 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 22 Dec 2008 08:34:00 +0000 Subject: -test FindFFmpeg.cmake Alex svn path=/trunk/KDE/kdelibs/; revision=900097 --- modules-tests/RunAllModuleTests.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules-tests/RunAllModuleTests.cmake') diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake index e523227b..d04385bf 100644 --- a/modules-tests/RunAllModuleTests.cmake +++ b/modules-tests/RunAllModuleTests.cmake @@ -1,5 +1,7 @@ -# run this script via "cmake -P RunAllModuletests.cmake" to +# Run this script via "cmake -P RunAllModuletests.cmake" to # execute all module tests in one go. +# Run this script with "cmake -DMODULE=foo -P RunAllModuletests.cmake" to +# test only the one specified module. # To see only the results and not the other cmake output, # you can grep for "::". # To have it delete the previous test build dirs, run it with -DCLEAN_DIRS=TRUE @@ -31,6 +33,7 @@ else(DEFINED MODULE) Blitz BlueZ Eigen2 + FFmpeg Flac Flex GObject -- cgit v1.2.1 From 81e042e87254db5293e1a1e3891f9529d0373b4d Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 23 Dec 2008 09:40:41 +0000 Subject: -add simple test for FindENCHANT.cmake Alex svn path=/trunk/KDE/kdelibs/; revision=900551 --- modules-tests/RunAllModuleTests.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules-tests/RunAllModuleTests.cmake') diff --git a/modules-tests/RunAllModuleTests.cmake b/modules-tests/RunAllModuleTests.cmake index d04385bf..d68f61fd 100644 --- a/modules-tests/RunAllModuleTests.cmake +++ b/modules-tests/RunAllModuleTests.cmake @@ -32,6 +32,7 @@ else(DEFINED MODULE) set(modulesToTest AGG Blitz BlueZ + ENCHANT Eigen2 FFmpeg Flac -- cgit v1.2.1