From b4e1765063851fe6951c11ba3fe5540e1cdfcb82 Mon Sep 17 00:00:00 2001
From: Wieland Morgenstern <git@morgenst.de>
Date: Fri, 26 Apr 2019 01:18:15 +0200
Subject: [PATCH] CI: run tests w/ ctest
---
.travis.yml | 1 +
docker/ci.dockerfile | 1 +
tests/cli_tests/CMakeLists.txt | 2 ++
3 files changed, 4 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 01aac64..82c5348 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,7 @@ matrix:
- cd build
- cmake -DCREATE_BOX_PACKAGE=OFF -DGPU_BACKEND_CUDA=OFF -DGPU_BACKEND_OPENCL=ON -DAPPLE_BREW=ON -DQt5_DIR=/usr/local/opt/qt/lib/cmake/Qt5 -G Ninja ..
- ninja
+ - ctest -LE cmd --output-on-failure
- name: CUDA 8 Linux
dist: xenial
services:
diff --git a/docker/ci.dockerfile b/docker/ci.dockerfile
index 1948bc0..9ac8312 100644
--- a/docker/ci.dockerfile
+++ b/docker/ci.dockerfile
@@ -7,3 +7,4 @@ RUN echo ${CUDA_SHORT} > cuda.version
WORKDIR build
RUN cmake -DCMAKE_BUILD_TYPE=Release -DLINUX_PKG=ON -DRTMP_NVENC=OFF -DCUDA_TARGET_ARCH="50" -G Ninja ..
RUN ninja
+RUN ctest -LE cmd --output-on-failure
diff --git a/tests/cli_tests/CMakeLists.txt b/tests/cli_tests/CMakeLists.txt
index 040e88c..3bf6179 100755
--- a/tests/cli_tests/CMakeLists.txt
+++ b/tests/cli_tests/CMakeLists.txt
@@ -9,6 +9,7 @@ function(add_cli_tests TESTS_TO_ADD)
COMMAND "behave" -t=-slow -D "BIN=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" -D GPU=${GPU_BACKEND_DEFAULT} "features/${test}")
set_property(TEST ${test} PROPERTY RUN_SERIAL TRUE)
set_property(TEST ${test} PROPERTY FOLDER "cli tests")
+ set_property(TEST ${test} PROPERTY LABELS "cmd")
endforeach()
endfunction(add_cli_tests TESTS_TO_ADD)
function(add_slow_cli_tests TESTS_TO_ADD)
@@ -19,6 +20,7 @@ function(add_slow_cli_tests TESTS_TO_ADD)
COMMAND "behave" -D "BIN=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" -D GPU=${GPU_BACKEND_DEFAULT} "features/${test}")
set_property(TEST ${test} PROPERTY RUN_SERIAL TRUE)
set_property(TEST ${test} PROPERTY FOLDER "cli tests")
+ set_property(TEST ${test} PROPERTY LABELS "cmd")
endforeach()
endfunction(add_slow_cli_tests TESTS_TO_ADD)
--
2.18.1