diff options
| author | Vasile Vilvoiu <vasi@vilvoiu.ro> | 2021-07-22 22:07:12 +0300 |
|---|---|---|
| committer | Vasile Vilvoiu <vasi@vilvoiu.ro> | 2021-07-22 22:07:12 +0300 |
| commit | 0b170434b41b473341e8896869a95381bc1c2fbb (patch) | |
| tree | ca4526c2ad612d7cb92517db8f8a5d2931c1b2f0 | |
| parent | bb54f97810284770f827af6d3d6f9417d8d318ca (diff) | |
Skip GetNiceTicks test when no Xorg is started.
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | test/test-renderer.cpp | 10 |
3 files changed, 14 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8fa439f..177f610 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v2 - name: Install dependencies - run: sudo apt-get install libfftw3-dev libsfml-dev libgtest-dev + run: sudo apt-get install libfftw3-dev libsfml-dev libgtest-dev libx11-dev - name: Create Build Environment # Some projects don't allow in-source building, so create a separate build directory diff --git a/CMakeLists.txt b/CMakeLists.txt index d6810b1..ba7b6e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,7 @@ find_library (FFTW3 fftw3) if (TESTING) find_package(GTest) + find_package(X11) endif() # Compiler setup @@ -31,7 +32,7 @@ add_compile_options (-Wall -Wextra -pedantic) set (SRC_DIR "${PROJECT_SOURCE_DIR}/src") set (MAN_DIR "${PROJECT_SOURCE_DIR}/man") -include_directories (${SOURCE_DIR}) +include_directories (${SOURCE_DIR} ${X11_INCLUDE_DIR}) # Get the latest abbreviated commit hash of the working branch # https://jonathanhamberg.com/post/cmake-embedding-git-hash/ @@ -107,6 +108,6 @@ if (TESTING) # Unit tests enable_testing () add_executable(unittest ${UNIT_TEST_SOURCES}) - target_link_libraries (unittest GTest::GTest ${PROJECT_NAME}_static Threads::Threads sfml-graphics ${FFTW3}) + target_link_libraries (unittest GTest::GTest ${PROJECT_NAME}_static Threads::Threads sfml-graphics ${FFTW3} ${X11_LIBRARIES}) gtest_discover_tests (unittest) endif() diff --git a/test/test-renderer.cpp b/test/test-renderer.cpp index d6b4284..be8d49c 100644 --- a/test/test-renderer.cpp +++ b/test/test-renderer.cpp @@ -6,6 +6,7 @@ */ #include "test.hpp" #include "../src/renderer.hpp" +#include <X11/Xlib.h> class ExposedRenderer : public Renderer { @@ -129,6 +130,15 @@ TEST(TestRenderer, GetLinearTicks) TEST(TestRenderer, GetNiceTicks) { + { /* skip if Xorg not started */ + auto display = XOpenDisplay(nullptr); + if (display == nullptr) { + GTEST_SKIP(); + } else { + XCloseDisplay(display); + } + } + constexpr double epsilon = 1e-9; /* configuration */ |