From fa056594557a75822982943a90d60517ac1eb044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Del=20Pino?= <stephane.delpino44@gmail.com>
Date: Mon, 4 Jun 2018 08:03:25 +0200
Subject: [PATCH] Fixes git revision test (when no git is installed)
---
tests/CMakeLists.txt | 13 ++++++++-----
tests/test_RevisionInfo.cpp | 9 ++++++++-
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 21ba01a73..16b77dd5a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,16 +1,19 @@
include_directories("${CATCH_INCLUDE_PATH}")
-
+include_directories("${PASTIS_BINARY_DIR}/src/utils")
set(EXECUTABLE_OUTPUT_PATH ${PASTIS_BINARY_DIR})
+
add_executable (unit_tests
test_main.cpp
test_RevisionInfo.cpp
- test_TinyVector.cpp)
+ test_TinyVector.cpp
+ )
target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR})
-target_link_libraries (
- unit_tests
+
+target_link_libraries (unit_tests
PastisUtils
- Catch)
+ Catch
+ )
enable_testing()
diff --git a/tests/test_RevisionInfo.cpp b/tests/test_RevisionInfo.cpp
index 9359c8cb3..d5c9d4b50 100644
--- a/tests/test_RevisionInfo.cpp
+++ b/tests/test_RevisionInfo.cpp
@@ -2,6 +2,13 @@
#include <RevisionInfo.hpp>
+#include <pastis_git_revision.hpp>
+
TEST_CASE("RevisionInfo", "[utils]") {
- REQUIRE(RevisionInfo::hasGitInfo() == true);
+#ifdef HAS_PASTIS_GIT_INFO
+#define HAS_GIT_INFO true
+#else
+#define HAS_GIT_INFO false
+#endif
+ REQUIRE( (RevisionInfo::hasGitInfo() == HAS_GIT_INFO) );
}
--
GitLab