Skip to content

Commit

Permalink
fix test-declaration in CMake-Files
Browse files Browse the repository at this point in the history
  • Loading branch information
jkriege2 committed Jan 23, 2024
1 parent 326bb36 commit a7e723d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
add_subdirectory(doc)

if (JKQtPlotter_BUILD_TESTS)
include(CTest)
add_subdirectory(tests)
endif()

Expand Down
8 changes: 6 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,10 @@ for:
echo == RUNNING UNIT TESTS FOR JKQtPlotter CMAKE BUILD ===============================================
cd $APPVEYOR_BUILD_FOLDER
cd build
ls *.
ls -l *.*
ls -l Testing/*
ls -l Testing/*.*
ctest --version
ctest --print-labels --build-config "$CONFIGURATION"
ctest --build-config "$CONFIGURATION" -VV --output-on-failure --output-junit test-results.xml
Expand Down Expand Up @@ -334,7 +338,7 @@ for:


artifacts:
- path: 'build/CMakeFiles/*.log'
- path: '$APPVEYOR_BUILD_FOLDER/build/CMakeFiles/*.log'
name: logs
- path: 'build/Testing/**/*.xml'
- path: '$APPVEYOR_BUILD_FOLDER/build/Testing/**/*.xml'
name: test_results
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ else()
message( STATUS ".. - Precompiled Header: OFF")
endif()
message( STATUS "............................................................................." )

include(CTest)
enable_testing()
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Test REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion tests/jkqtcommmon/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ target_sources(${EXENAME}

# Installation
install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
add_test(NAME ${TEST_NAME} COMMAND ${EXENAME})
add_test(NAME ${TEST_NAME} COMMAND COMMAND $<TARGET_FILE:${EXENAME}>)

#Installation of Qt DLLs on Windows
jkqtplotter_deployqt(${EXENAME})
Expand Down

0 comments on commit a7e723d

Please sign in to comment.