Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,16 @@ function(add_test_executable TEST_TARGET OUT_VARIABLE)
add_dependencies(${TEST_TARGET} roadrunner-static gtest gtest_main gmock gmock_main rr-mockups)
set_target_properties(${TEST_TARGET} PROPERTIES LINKER_LANGUAGE CXX)

# Add to ctest.
# Add to ctest. DISCOVERY_MODE PRE_TEST defers running the built binary
# with --gtest_list_tests until ctest itself is invoked, instead of
# running it immediately after linking (the POST_BUILD default). That
# avoids a Windows race where the freshly-linked exe isn't fully
# released yet, which was causing ParseTestList.cmake to fail on
# truncated/empty JSON output.
set(TEST_ENV_VARS "testdir=${RR_ROOT}/test" "CTEST_OUTPUT_ON_FAILURE=TRUE")
gtest_discover_tests(
${TEST_TARGET}
DISCOVERY_MODE PRE_TEST
DISCOVERY_TIMEOUT 500
PROPERTIES
TIMEOUT 500
Expand Down
4 changes: 2 additions & 2 deletions test/c_api_core/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
add_test_executable(test_c_api_core test_targets
rrSBMLTestSuiteSimulation_CAPI
rrSBMLTestSuiteSimulation_CAPI.cpp
${SharedTestFiles}
exceptions.cpp
CAPICoreTest
CAPICoreTest.cpp
libstruct.cpp
model_editing.cpp
SimulateOptionsCAPITests.cpp
Expand Down
2 changes: 1 addition & 1 deletion test/c_api_rrtests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
add_test_executable(test_c_api_rrtests test_targets
${SharedTestFiles} NomTests.cpp RRTestFileTests OtherRRTestFileTests.cpp
${SharedTestFiles} NomTests.cpp RRTestFileTests.cpp OtherRRTestFileTests.cpp
)

# make test_targets list global to all tests
Expand Down
4 changes: 1 addition & 3 deletions test/sundials-tests/SundialsSteadyStateTests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


set(SharedTestFiles "${SharedTestFiles}" "${CMAKE_CURRENT_SOURCE_DIR}/SundialsSteadyStateSolverUnitTest")
set(SharedTestFiles "${SharedTestFiles}" "${CMAKE_CURRENT_SOURCE_DIR}/SundialsSteadyStateSolverUnitTest.cpp")
## FixedPointIteration not finished due to difficulties getting it to work.
#add_test_executable(
# FixedPointIterationTests test_targets
Expand All @@ -15,15 +15,13 @@ add_test_executable(
add_test_executable(
test_sundials_automatic_moiety_conservation test_targets
AutomaticMoietyConservationTests.cpp
SundialsSteadyStateSolverUnitTest
${SharedTestFiles}
)


add_test_executable(
test_sundials_steady_state_unit_basic_newton test_targets
SundialsNewtonIterationUnitTests.cpp
SundialsSteadyStateSolverUnitTest
${SharedTestFiles}
)

Expand Down
Loading