aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2019-12-10 16:34:48 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2019-12-10 16:44:54 +0300
commitb49eec6684b03b1a399b319a35d2b17c8ee4a66b (patch)
tree39a68104a496d63fb25bcde74df6a68d50fa8e27
parentAppVeyor/Travis: switch to cmake/build (diff)
downloadmath-server-b49eec6684b03b1a399b319a35d2b17c8ee4a66b.tar.gz
math-server-b49eec6684b03b1a399b319a35d2b17c8ee4a66b.zip
bin/unit_tests -> bin/test/unit_tests
-rw-r--r--.travis.yml2
-rw-r--r--appveyor.yml2
-rw-r--r--client/Dockerfile2
-rw-r--r--server/Dockerfile2
-rw-r--r--test/unit_tests/CMakeLists.txt2
5 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 9ce761a..89e0329 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,4 +20,4 @@ script:
--boost "$HOME/boost_1_71_0" \
--boost-librarydir "$HOME/boost_1_71_0/stage/$platform/${configuration,,}/lib" \
-- -DENABLE_TESTS=ON
- - "$HOME/install/bin/unit_tests"
+ - "$HOME/install/bin/test/unit_tests"
diff --git a/appveyor.yml b/appveyor.yml
index 515d8ca..f731b1c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,7 +23,7 @@ build_script:
- '"%python_exe%" cmake\build\build_appveyor.py --install "%install_dir%" --boost "%appveyor_boost_root%" --boost-librarydir "%appveyor_boost_librarydir%" -- -DENABLE_TESTS=ON'
test_script:
- - '"%install_dir%\bin\unit_tests.exe"'
+ - '"%install_dir%\bin\test\unit_tests.exe"'
for:
# Only build Release builds for master to speed things up:
diff --git a/client/Dockerfile b/client/Dockerfile
index 9b2ab51..a447ab8 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -27,7 +27,7 @@ RUN "$src_dir/cmake/build/build.py" \
--clean \
--configuration Release \
-- -DENABLE_TESTS=ON \
- && /usr/local/bin/unit_tests --log_level=all
+ && /usr/local/bin/test/unit_tests --log_level=all
ENTRYPOINT ["/usr/local/bin/client"]
CMD ["-c", "2 * 2"]
diff --git a/server/Dockerfile b/server/Dockerfile
index 96bb51c..9c9adea 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -27,6 +27,6 @@ RUN "$src_dir/cmake/build/build.py" \
--clean \
--configuration Release \
-- -DENABLE_TESTS=ON \
- && /usr/local/bin/unit_tests --log_level=all
+ && /usr/local/bin/test/unit_tests --log_level=all
CMD ["/usr/local/bin/server"]
diff --git a/test/unit_tests/CMakeLists.txt b/test/unit_tests/CMakeLists.txt
index db731ee..43530f1 100644
--- a/test/unit_tests/CMakeLists.txt
+++ b/test/unit_tests/CMakeLists.txt
@@ -7,4 +7,4 @@ target_include_directories(unit_tests PRIVATE ../..)
target_include_directories(unit_tests SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
target_link_libraries(unit_tests PRIVATE ${Boost_LIBRARIES})
-install(TARGETS unit_tests RUNTIME DESTINATION bin)
+install(TARGETS unit_tests RUNTIME DESTINATION bin/test)