From 8bd3346a2f5a506f542279ed21bb7197ce330e7e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 7 Nov 2014 15:51:10 +0100
Subject: [PATCH] Fix travis build temporarily, tester test depends on wrapper
test.
---
scripts/cmake/test/AddTest.cmake | 2 ++
scripts/cmake/test/Test.cmake | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index 251303443b3..036d085feca 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -148,5 +148,7 @@ function (AddTest)
-P ${PROJECT_SOURCE_DIR}/scripts/cmake/test/AddTestTester.cmake
)
endif()
+ set_tests_properties(${AddTest_EXECUTABLE}-${AddTest_NAME}-${AddTest_WRAPPER}-${AddTest_TESTER}
+ PROPERTIES DEPENDS ${AddTest_EXECUTABLE}-${AddTest_NAME}-${AddTest_WRAPPER})
endfunction()
diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index 29532ce0b82..d68cdc6c62f 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -1,6 +1,7 @@
# Find tools and data
FIND_PROGRAM(DIFF_TOOL_PATH diff)
-FIND_PROGRAM(TIME_TOOL_PATH time)
+# FIND_PROGRAM(TIME_TOOL_PATH time) # TODO: does not work Travis
+SET(TIME_TOOL_PATH time)
FIND_PROGRAM(GREP_TOOL_PATH grep)
FIND_PROGRAM(BASH_TOOL_PATH bash)
FIND_PROGRAM(VALGRIND_TOOL_PATH valgrind)
--
GitLab