aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2017-10-07 14:19:00 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2017-10-07 14:19:00 +0200
commitbadeb19f9d43fafe7a94e9028ad9e65ef4bc1770 (patch)
treea075a385c70ae94ed91cd5be242acdc184556089
parente46150ab77959dfa44905b6db1ef9f5aaecb4a3b (diff)
downloadlibnitrokey-badeb19f9d43fafe7a94e9028ad9e65ef4bc1770.tar.gz
libnitrokey-badeb19f9d43fafe7a94e9028ad9e65ef4bc1770.tar.bz2
Enable offline test on all instances
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
-rw-r--r--.travis.yml2
-rw-r--r--CMakeLists.txt21
2 files changed, 11 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml
index 22b1d07..f35c7f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
language: generic
sudo: false
os: osx
-env: CF=
+env: CF=-DCOMPILE_TESTS=ON
matrix:
include:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1248e23..c868fae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,11 +127,18 @@ install (FILES ${LIB_INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libnitrok
install (TARGETS ${LIBNAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
install (TARGETS ${LIBNAME}-log DESTINATION ${CMAKE_INSTALL_LIBDIR})
-IF (COMPILE_TESTS)
- include_directories(unittest/Catch/include)
- add_library(catch STATIC unittest/catch_main.cpp )
+include_directories(unittest/Catch/include)
+add_library(catch STATIC unittest/catch_main.cpp )
+add_executable (test_offline unittest/test_offline.cc)
+target_link_libraries (test_offline ${EXTRA_LIBS} ${LIBNAME}-log catch)
+#run with 'make test' or 'ctest'
+include (CTest)
+add_test (runs test_offline)
+IF (COMPILE_TESTS)
+ #needs connected PRO device for success
+ #warning: it may delete data on the device
add_executable (test_C_API unittest/test_C_API.cpp)
target_link_libraries (test_C_API ${EXTRA_LIBS} ${LIBNAME}-log catch)
@@ -150,14 +157,6 @@ IF (COMPILE_TESTS)
add_executable (test_issues unittest/test_issues.cc)
target_link_libraries (test_issues ${EXTRA_LIBS} ${LIBNAME}-log catch)
- add_executable (test_offline unittest/test_offline.cc)
- target_link_libraries (test_offline ${EXTRA_LIBS} ${LIBNAME}-log catch)
-
- #run with 'make test' or 'ctest'
- #needs connected PRO device for success
- #warning: it may delete data on the device
- include (CTest)
- add_test (runs test_offline)
ENDIF()