From ffd083a119e2a6524488c5eeca77fe42abbacf71 Mon Sep 17 00:00:00 2001
From: Maximilien Siavelis <maximilien.siavelis@simulease.com>
Date: 周日, 14 1月 2018 07:05:44 +0800
Subject: [PATCH] relative path for tests
---
test/library/CMakeLists.txt | 6 ++----
test/functional/CMakeLists.txt | 7 +++----
test/license-generator/CMakeLists.txt | 4 +---
src/build_properties.h.in | 4 ++--
README.md | 13 +++++++++++++
5 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index 96bdaba..295c125 100644
--- a/README.md
+++ b/README.md
@@ -65,3 +65,16 @@
make
make install
```
+
+How to test
+===========
+
+## on Linux :
+```
+make test
+```
+
+## on Windows :
+```
+ctest -C Release
+```
diff --git a/src/build_properties.h.in b/src/build_properties.h.in
index fcd760a..240ff99 100644
--- a/src/build_properties.h.in
+++ b/src/build_properties.h.in
@@ -7,6 +7,6 @@
#define PROJECT_SRC_DIR "@CMAKE_CURRENT_LIST_DIR@"
#define PROJECT_BASE_DIR "@CMAKE_SOURCE_DIR@"
#define PROJECT_TEST_SRC_DIR "@CMAKE_SOURCE_DIR@/test"
-#define PROJECT_TEST_TEMP_DIR "@CMAKE_BINARY_DIR@/Testing/Temporary"
+#define PROJECT_TEST_TEMP_DIR "Testing/Temporary"
#define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
-#endif
\ No newline at end of file
+#endif
diff --git a/test/functional/CMakeLists.txt b/test/functional/CMakeLists.txt
index 9ec800e..0fc9432 100644
--- a/test/functional/CMakeLists.txt
+++ b/test/functional/CMakeLists.txt
@@ -50,8 +50,7 @@
#SET_TARGET_PROPERTIES(volid_test PROPERTIES LINK_SEARCH_START_STATIC ON)
#add_dependencies( volid_test boost_test boost_filesystem )
-ADD_TEST(standard_license_test ${EXECUTABLE_OUTPUT_PATH}/standard_license_test)
-ADD_TEST(date_test ${EXECUTABLE_OUTPUT_PATH}/date_test)
-ADD_TEST(volid_test ${EXECUTABLE_OUTPUT_PATH}/volid_test)
+ADD_TEST(NAME standard_license_test COMMAND standard_license_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ADD_TEST(NAME date_test COMMAND date_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ADD_TEST(NAME volid_test COMMAND volid_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-install(TARGETS standard_license_test date_test volid_test RUNTIME DESTINATION bin)
diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index 44e8c80..314aa6f 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -12,7 +12,7 @@
#SET_TARGET_PROPERTIES(license_reader_test PROPERTIES LINK_SEARCH_START_STATIC ON)
#SET_TARGET_PROPERTIES(license_reader_test PROPERTIES LINK_SEARCH_END_STATIC OFF)
-ADD_TEST(license_reader_test ${EXECUTABLE_OUTPUT_PATH}/license_reader_test)
+ADD_TEST(NAME license_reader_test COMMAND license_reader_test)
IF(WIN32)
#test windows
@@ -30,8 +30,6 @@
#add_dependencies( os_linux_test )
#SET_TARGET_PROPERTIES(os_linux_test PROPERTIES LINK_SEARCH_START_STATIC ON)
- ADD_TEST(os_linux_test ${EXECUTABLE_OUTPUT_PATH}/os_linux_test)
+ ADD_TEST(NAME os_linux_test COMMAND os_linux_test)
ENDIF(WIN32)
-
-install(TARGETS license_reader_test RUNTIME DESTINATION bin)
diff --git a/test/license-generator/CMakeLists.txt b/test/license-generator/CMakeLists.txt
index 5176e28..484d15e 100644
--- a/test/license-generator/CMakeLists.txt
+++ b/test/license-generator/CMakeLists.txt
@@ -12,6 +12,4 @@
#add_dependencies( license_generator_test boost_test boost_filesystem )
#SET_TARGET_PROPERTIES(license_generator_test PROPERTIES LINK_SEARCH_START_STATIC ON)
-ADD_TEST(license_generator_test ${EXECUTABLE_OUTPUT_PATH}/license_generator_test)
-
-install(TARGETS license_generator_test RUNTIME DESTINATION bin)
+ADD_TEST(NAME license_generator_test COMMAND license_generator_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
--
Gitblit v1.9.1