diff options
| author | Aleix Pol <aleixpol@kde.org> | 2017-04-11 17:19:21 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2017-04-11 17:19:21 +0200 |
| commit | 1eeae4015bca728160f651f781d73851cc4c43ae (patch) | |
| tree | 301648d1ddfe383cd8578856b1e7503638f3e99e /modules | |
| parent | 78529f4452b2e09d9f579d7723f7cb7634f43e7c (diff) | |
| download | extra-cmake-modules-1eeae4015bca728160f651f781d73851cc4c43ae.tar.gz extra-cmake-modules-1eeae4015bca728160f651f781d73851cc4c43ae.tar.bz2 | |
Don't include tests together with modules
We have tests that go through the modules directory
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ECMGenerateQmlTypes.cmake | 2 | ||||
| -rw-r--r-- | modules/test_execute_and_compare.cmake | 11 |
2 files changed, 1 insertions, 12 deletions
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() |