mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
tests: move TestGitStorage to its own test config
This way 'make check' doesn't execute TestGitStorage anymore. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
7068e64e49
commit
a58eee9aa3
1 changed files with 6 additions and 4 deletions
|
@ -50,6 +50,9 @@ endif()
|
||||||
|
|
||||||
# Helper function TEST used to created rules to build, link, install and run tests
|
# Helper function TEST used to created rules to build, link, install and run tests
|
||||||
function(TEST NAME FILE)
|
function(TEST NAME FILE)
|
||||||
|
if(DEFINED ARGV2)
|
||||||
|
set(CFGARG "CONFIGURATIONS" ${ARGV2})
|
||||||
|
endif()
|
||||||
get_filename_component(HDR "${FILE}" NAME_WE)
|
get_filename_component(HDR "${FILE}" NAME_WE)
|
||||||
add_executable(${NAME} ${FILE} ${HDR}.h)
|
add_executable(${NAME} ${FILE} ${HDR}.h)
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
|
@ -70,7 +73,7 @@ function(TEST NAME FILE)
|
||||||
# Run test using wine
|
# Run test using wine
|
||||||
if(WINE_PROGRAM)
|
if(WINE_PROGRAM)
|
||||||
add_test(
|
add_test(
|
||||||
NAME ${NAME}
|
NAME ${NAME} ${CFGARG}
|
||||||
COMMAND "$<TARGET_FILE:${NAME}>"
|
COMMAND "$<TARGET_FILE:${NAME}>"
|
||||||
WORKING_DIRECTORY ${WINDOWS_STAGING_TESTS}
|
WORKING_DIRECTORY ${WINDOWS_STAGING_TESTS}
|
||||||
)
|
)
|
||||||
|
@ -80,7 +83,7 @@ function(TEST NAME FILE)
|
||||||
set_tests_properties(${NAME} PROPERTIES DEPENDS PrepareTests)
|
set_tests_properties(${NAME} PROPERTIES DEPENDS PrepareTests)
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
add_test(NAME ${NAME} COMMAND $<TARGET_FILE:${NAME}>)
|
add_test(NAME ${NAME} ${CFGARG} COMMAND $<TARGET_FILE:${NAME}>)
|
||||||
endif()
|
endif()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
|
@ -112,7 +115,7 @@ TEST(TestDiveSiteDuplication testdivesiteduplication.cpp)
|
||||||
TEST(TestRenumber testrenumber.cpp)
|
TEST(TestRenumber testrenumber.cpp)
|
||||||
# this keeps randomly failing and I don't understand why
|
# this keeps randomly failing and I don't understand why
|
||||||
# too many false positives, so disabling this test for now
|
# too many false positives, so disabling this test for now
|
||||||
TEST(TestGitStorage testgitstorage.cpp)
|
TEST(TestGitStorage testgitstorage.cpp storageconfig)
|
||||||
TEST(TestPicture testpicture.cpp)
|
TEST(TestPicture testpicture.cpp)
|
||||||
TEST(TestMerge testmerge.cpp)
|
TEST(TestMerge testmerge.cpp)
|
||||||
TEST(TestTagList testtaglist.cpp)
|
TEST(TestTagList testtaglist.cpp)
|
||||||
|
@ -150,7 +153,6 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}
|
||||||
TestProfile
|
TestProfile
|
||||||
TestGpsCoords
|
TestGpsCoords
|
||||||
TestParse
|
TestParse
|
||||||
# TestGitStorage
|
|
||||||
TestPlan
|
TestPlan
|
||||||
TestAirPressure
|
TestAirPressure
|
||||||
TestDiveSiteDuplication
|
TestDiveSiteDuplication
|
||||||
|
|
Loading…
Reference in a new issue