From 1bcdcab05727d44ddd16a13ae73caac56b22ca07 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 15 Nov 2018 17:58:02 +0100 Subject: [PATCH] Restructure desktop file tests, build single binary --- tests/core/CMakeLists.txt | 33 ++----------------- tests/core/desktopfile/CMakeLists.txt | 16 +++++++++ tests/core/desktopfile/main.cpp | 2 ++ .../{ => desktopfile}/test_desktopfile.cpp | 0 .../test_desktopfile_conformance.cpp | 0 .../test_desktopfileentry.cpp | 0 .../test_desktopfilereader.cpp | 0 .../test_desktopfilewriter.cpp | 0 8 files changed, 20 insertions(+), 31 deletions(-) create mode 100644 tests/core/desktopfile/CMakeLists.txt create mode 100644 tests/core/desktopfile/main.cpp rename tests/core/{ => desktopfile}/test_desktopfile.cpp (100%) rename tests/core/{ => desktopfile}/test_desktopfile_conformance.cpp (100%) rename tests/core/{ => desktopfile}/test_desktopfileentry.cpp (100%) rename tests/core/{ => desktopfile}/test_desktopfilereader.cpp (100%) rename tests/core/{ => desktopfile}/test_desktopfilewriter.cpp (100%) diff --git a/tests/core/CMakeLists.txt b/tests/core/CMakeLists.txt index 0cbf0ba..0946844 100644 --- a/tests/core/CMakeLists.txt +++ b/tests/core/CMakeLists.txt @@ -39,34 +39,5 @@ add_test(test_linuxdeploy test_linuxdeploy) add_dependencies(test_linuxdeploy simple_library simple_executable) -add_executable(test_desktopfilereader test_desktopfilereader.cpp) -target_link_libraries(test_desktopfilereader PRIVATE linuxdeploy_core_desktopfile gtest gtest_main) - -add_test(test_desktopfilereader test_desktopfilereader) - - -add_executable(test_desktopfileentry test_desktopfileentry.cpp) -target_link_libraries(test_desktopfileentry PRIVATE linuxdeploy_core_desktopfile gtest gtest_main) - -add_test(test_desktopfileentry test_desktopfileentry) - - -add_executable(test_desktopfilewriter test_desktopfilewriter.cpp) -target_link_libraries(test_desktopfilewriter PRIVATE linuxdeploy_core_desktopfile gtest gtest_main) - -add_test(test_desktopfilewriter test_desktopfilewriter) - - -add_executable(test_desktopfile test_desktopfile.cpp) -target_link_libraries(test_desktopfile PRIVATE linuxdeploy_core_desktopfile gtest gtest_main) -set_property(TARGET test_desktopfile - PROPERTY COMPILE_FLAGS "-DDESKTOP_FILE_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../data/simple_app.desktop\\\"" -) - -add_test(test_desktopfile test_desktopfile) - - -add_executable(test_desktopfile_conformance test_desktopfile_conformance.cpp) -target_link_libraries(test_desktopfile_conformance PRIVATE linuxdeploy_core_desktopfile gtest gtest_main) - -add_test(test_desktopfile_conformance test_desktopfile_conformance) +# include desktop file tests +add_subdirectory(desktopfile) diff --git a/tests/core/desktopfile/CMakeLists.txt b/tests/core/desktopfile/CMakeLists.txt new file mode 100644 index 0000000..34c0047 --- /dev/null +++ b/tests/core/desktopfile/CMakeLists.txt @@ -0,0 +1,16 @@ +# build a single test binary +add_executable(test_desktopfile + test_desktopfile.cpp + test_desktopfileentry.cpp + test_desktopfilereader.cpp + test_desktopfilewriter.cpp + test_desktopfile_conformance.cpp +) + +target_link_libraries(test_desktopfile PRIVATE linuxdeploy_core_desktopfile gtest gtest_main) + +set_property(TARGET test_desktopfile + PROPERTY COMPILE_FLAGS "-DDESKTOP_FILE_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../data/simple_app.desktop\\\"" +) + +add_test(test_desktopfile test_desktopfile) diff --git a/tests/core/desktopfile/main.cpp b/tests/core/desktopfile/main.cpp new file mode 100644 index 0000000..c7d7b54 --- /dev/null +++ b/tests/core/desktopfile/main.cpp @@ -0,0 +1,2 @@ +#define +#include diff --git a/tests/core/test_desktopfile.cpp b/tests/core/desktopfile/test_desktopfile.cpp similarity index 100% rename from tests/core/test_desktopfile.cpp rename to tests/core/desktopfile/test_desktopfile.cpp diff --git a/tests/core/test_desktopfile_conformance.cpp b/tests/core/desktopfile/test_desktopfile_conformance.cpp similarity index 100% rename from tests/core/test_desktopfile_conformance.cpp rename to tests/core/desktopfile/test_desktopfile_conformance.cpp diff --git a/tests/core/test_desktopfileentry.cpp b/tests/core/desktopfile/test_desktopfileentry.cpp similarity index 100% rename from tests/core/test_desktopfileentry.cpp rename to tests/core/desktopfile/test_desktopfileentry.cpp diff --git a/tests/core/test_desktopfilereader.cpp b/tests/core/desktopfile/test_desktopfilereader.cpp similarity index 100% rename from tests/core/test_desktopfilereader.cpp rename to tests/core/desktopfile/test_desktopfilereader.cpp diff --git a/tests/core/test_desktopfilewriter.cpp b/tests/core/desktopfile/test_desktopfilewriter.cpp similarity index 100% rename from tests/core/test_desktopfilewriter.cpp rename to tests/core/desktopfile/test_desktopfilewriter.cpp