Explorar o código

simplify unit tests

Julius Pfrommer %!s(int64=10) %!d(string=hai) anos
pai
achega
4910fa77c1
Modificáronse 4 ficheiros con 11 adicións e 21 borrados
  1. 1 1
      .travis.yml
  2. 0 1
      CMakeLists.txt
  3. 1 1
      README.md
  4. 9 18
      tests/CMakeLists.txt

+ 1 - 1
.travis.yml

@@ -36,7 +36,7 @@ script:
    - echo "Debug build and unit tests"
    - make clean
    - cmake -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTS=ON -DENABLE_COVERAGE=ON .. 
-   - make && make check
+   - make && make test
 after_success:
    - git clone --depth=50 -b gh-pages https://$GITAUTH@github.com/acplt/open62541
    - rm -rf open62541/doxygen

+ 0 - 1
CMakeLists.txt

@@ -162,6 +162,5 @@ endif(GENERATE_DOCUMENTATION)
 option(UNIT_TESTS "Run unit tests after building" OFF)
 if(UNIT_TESTS)
     enable_testing()
-	add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
     add_subdirectory(tests)
 endif(UNIT_TESTS)

+ 1 - 1
README.md

@@ -33,7 +33,7 @@ sudo apt-get install graphviz doxygen # for documentation generation
 
 ccmake .. # to select features for compilation. Use "cmake-gui .." for more eye-candy
 make
-make check # unit tests
+make test # unit tests
 make doc # generate documentation
 ```
 

+ 9 - 18
tests/CMakeLists.txt

@@ -3,47 +3,38 @@ find_package(Threads REQUIRED)
 
 set(LIBS open62541 ${CHECK_LIBRARIES} m rt pthread)
 
-add_executable(check_builtin EXCLUDE_FROM_ALL check_builtin.c)
+add_executable(check_builtin check_builtin.c)
 target_link_libraries(check_builtin ${LIBS})
 add_test(builtin ${CMAKE_CURRENT_BINARY_DIR}/check_builtin)
-add_dependencies(check check_builtin)
 
-add_executable(check_memory EXCLUDE_FROM_ALL check_memory.c)
+add_executable(check_memory check_memory.c)
 target_link_libraries(check_memory ${LIBS})
 add_test(memory ${CMAKE_CURRENT_BINARY_DIR}/check_memory)
-add_dependencies(check check_memory)
 
-add_executable(check_stack EXCLUDE_FROM_ALL check_stack.c)
+add_executable(check_stack check_stack.c)
 target_link_libraries(check_stack ${LIBS})
 add_test(stack ${CMAKE_CURRENT_BINARY_DIR}/check_stack)
-add_dependencies(check check_stack)
 
-add_executable(check_list EXCLUDE_FROM_ALL check_list.c)
+add_executable(check_list check_list.c)
 target_link_libraries(check_list ${LIBS})
 add_test(list ${CMAKE_CURRENT_BINARY_DIR}/check_list)
-add_dependencies(check check_list)
 
-add_executable(check_indexedList EXCLUDE_FROM_ALL check_indexedList.c)
+add_executable(check_indexedList check_indexedList.c)
 target_link_libraries(check_indexedList ${LIBS})
 add_test(indexedList ${CMAKE_CURRENT_BINARY_DIR}/check_indexedList)
-add_dependencies(check check_indexedList)
 
-add_executable(check_base64 EXCLUDE_FROM_ALL check_base64.c)
+add_executable(check_base64 check_base64.c)
 target_link_libraries(check_base64 ${LIBS})
 add_test(base64 ${CMAKE_CURRENT_BINARY_DIR}/check_base64)
-add_dependencies(check check_base64)
 
-add_executable(check_services_view EXCLUDE_FROM_ALL check_services_view.c)
+add_executable(check_services_view check_services_view.c)
 target_link_libraries(check_services_view ${LIBS})
 add_test(services_view ${CMAKE_CURRENT_BINARY_DIR}/check_services_view)
-add_dependencies(check check_services_view)
 
-add_executable(check_namespace EXCLUDE_FROM_ALL check_namespace.c)
+add_executable(check_namespace check_namespace.c)
 target_link_libraries(check_namespace ${LIBS})
 add_test(namespace ${CMAKE_CURRENT_BINARY_DIR}/check_namespace)
-add_dependencies(check check_namespace)
 
-add_executable(check_startup EXCLUDE_FROM_ALL check_startup.c)
+add_executable(check_startup check_startup.c)
 target_link_libraries(check_startup ${LIBS})
 add_test(startup ${CMAKE_CURRENT_BINARY_DIR}/check_startup)
-add_dependencies(check check_startup)