From 1eeae4015bca728160f651f781d73851cc4c43ae Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Tue, 11 Apr 2017 17:19:21 +0200
Subject: Don't include tests together with modules

We have tests that go through the modules directory
---
 CMakeLists.txt                              |  3 +++
 modules/ECMGenerateQmlTypes.cmake           |  2 +-
 modules/test_execute_and_compare.cmake      | 11 -----------
 test-modules/test_execute_and_compare.cmake | 11 +++++++++++
 4 files changed, 15 insertions(+), 12 deletions(-)
 delete mode 100644 modules/test_execute_and_compare.cmake
 create mode 100644 test-modules/test_execute_and_compare.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a209511..a3f47652 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,6 +114,9 @@ endif()
 file(GLOB installModuleFiles ${CMAKE_SOURCE_DIR}/modules/*[^~])
 install(FILES ${installModuleFiles} DESTINATION ${MODULES_INSTALL_DIR})
 
+file(GLOB installTestModuleFiles ${CMAKE_SOURCE_DIR}/test-modules/*[^~])
+install(FILES ${installTestModuleFiles} DESTINATION ${SHARE_INSTALL_DIR}/ECM/test-modules)
+
 file(GLOB installKdeModuleFiles ${CMAKE_SOURCE_DIR}/kde-modules/*[^~])
 install(FILES ${installKdeModuleFiles} DESTINATION ${KDE_MODULES_INSTALL_DIR})
 
diff --git a/modules/ECMGenerateQmlTypes.cmake b/modules/ECMGenerateQmlTypes.cmake
index 0a27b9e1..e403fefd 100644
--- a/modules/ECMGenerateQmlTypes.cmake
+++ b/modules/ECMGenerateQmlTypes.cmake
@@ -76,7 +76,7 @@ function(ecm_generate_qmltypes)
     # sometimes qmlplugindump output isn't reproducible, we better have it opt in for now
     if(ARG_TEST_ENABLED)
         add_test(NAME ${targetname} COMMAND
-            cmake -DARG_UNPARSED_ARGUMENTS=${processedArgs} -DKDE_INSTALL_QMLDIR=${KDE_INSTALL_QMLDIR} -DINPUT=${generatedFile} -P ${ECM_MODULE_DIR}/test_execute_and_compare.cmake
+            cmake -DARG_UNPARSED_ARGUMENTS=${processedArgs} -DKDE_INSTALL_QMLDIR=${KDE_INSTALL_QMLDIR} -DINPUT=${generatedFile} -P ${ECM_MODULE_DIR}/../test-modules/test_execute_and_compare.cmake
         )
     endif()
 endfunction()
diff --git a/modules/test_execute_and_compare.cmake b/modules/test_execute_and_compare.cmake
deleted file mode 100644
index 0f325d95..00000000
--- a/modules/test_execute_and_compare.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-string(REPLACE / ";" processedArgs "${ARG_UNPARSED_ARGUMENTS}")
-
-execute_process(COMMAND qmlplugindump -nonrelocatable ${processedArgs} ${KDE_INSTALL_QMLDIR} > ${CMAKE_CURRENT_SOURCE_DIR}/plugins.qmltypes RESULT_VARIABLE code)
-if(code)
-    message(FATAL_ERROR "Could not call qmlplugindump successfully. Exited with code ${code}")
-endif()
-
-execute_process(COMMAND diff -I "//*" ${INPUT} ${CMAKE_CURRENT_SOURCE_DIR}/plugins.qmltypes RESULT_VARIABLE code OUTPUT_VARIABLE out)
-if(code)
-    message(FATAL_ERROR "both plugin dumps differ:\n${out}")
-endif()
diff --git a/test-modules/test_execute_and_compare.cmake b/test-modules/test_execute_and_compare.cmake
new file mode 100644
index 00000000..0f325d95
--- /dev/null
+++ b/test-modules/test_execute_and_compare.cmake
@@ -0,0 +1,11 @@
+string(REPLACE / ";" processedArgs "${ARG_UNPARSED_ARGUMENTS}")
+
+execute_process(COMMAND qmlplugindump -nonrelocatable ${processedArgs} ${KDE_INSTALL_QMLDIR} > ${CMAKE_CURRENT_SOURCE_DIR}/plugins.qmltypes RESULT_VARIABLE code)
+if(code)
+    message(FATAL_ERROR "Could not call qmlplugindump successfully. Exited with code ${code}")
+endif()
+
+execute_process(COMMAND diff -I "//*" ${INPUT} ${CMAKE_CURRENT_SOURCE_DIR}/plugins.qmltypes RESULT_VARIABLE code OUTPUT_VARIABLE out)
+if(code)
+    message(FATAL_ERROR "both plugin dumps differ:\n${out}")
+endif()
-- 
cgit v1.2.1