diff options
author | Robert Tari <robert@tari.in> | 2021-02-03 11:26:28 +0100 |
---|---|---|
committer | Robert Tari <robert@tari.in> | 2021-02-03 11:26:28 +0100 |
commit | d8691254183e618ad3cad4a2e6756b4bdfe59ba6 (patch) | |
tree | bab9ce006d9004ea879df78e3f2413f7bc73c94f | |
parent | 3cc2c952f3ec6d93649328a550f3ec5d10b238e2 (diff) | |
parent | b68ebfc00845a4329cfa625e92bb350b25c250ec (diff) | |
download | libayatana-common-d8691254183e618ad3cad4a2e6756b4bdfe59ba6.tar.gz libayatana-common-d8691254183e618ad3cad4a2e6756b4bdfe59ba6.tar.bz2 libayatana-common-d8691254183e618ad3cad4a2e6756b4bdfe59ba6.zip |
Merge branch 'sunweaver-pr/no-lomiri-tests-without-url-dispatcher'
Attributes GH PR #1: https://github.com/AyatanaIndicators/libayatana-common/pull/1
-rw-r--r-- | tests/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/tst_utils.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d4c068c..d805971 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,9 @@ find_package(GMock) +if(URLDISPATCHER_FOUND) + add_definitions( -DHAS_URLDISPATCHER ) +endif() + include_directories( ${CMAKE_SOURCE_DIR}/src ) diff --git a/tests/tst_utils.cpp b/tests/tst_utils.cpp index d7a4946..ac671f0 100644 --- a/tests/tst_utils.cpp +++ b/tests/tst_utils.cpp @@ -35,12 +35,14 @@ public: } }; +#ifdef HAS_URLDISPATCHER TEST_F(XdgCurrentDesktopUtilsTest, isLomiri) { EXPECT_FALSE(is_lomiri()); setenv("XDG_CURRENT_DESKTOP", "Lomiri", 1); EXPECT_TRUE(is_lomiri()); } +#endif TEST_F(XdgCurrentDesktopUtilsTest, isGnome) { |