Skip to content

Commit

Permalink
Merge pull request #288 from lanl/mauneyc/fix-nospiner-test
Browse files Browse the repository at this point in the history
Disable tests that use databox when spiner is off
  • Loading branch information
Yurlungur authored Aug 4, 2023
2 parents 651d996 + ffd570e commit e5706f1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- [[PR269]](https://github.com/lanl/singularity-eos/pull/269) Add SAP Polynomial EoS

### Fixed (Repair bugs, etc)
- [[PR288]](https://github.com/lanl/singularity-eos/pull/288) Don't build tests that depend on spiner when spiner is disabled
- [[PR287]](https://github.com/lanl/singularity-eos/pull/287) Fix testing logic with new HDF5 options
- [[PR282]](https://github.com/lanl/singularity-eos/pull/282) Fix missing deep copy in sap polynomial tests
- [[PR281]](https://github.com/lanl/singularity-eos/pull/281) Pin spiner in spackage to a specific, tested version
Expand Down
8 changes: 5 additions & 3 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ if(SINGULARITY_USE_EOSPAC AND SINGULARITY_TEST_SESAME)
PRIVATE Catch2::Catch2 singularity-eos::singularity-eos)
endif()

if(SINGULARITY_BUILD_CLOSURE)
if(SINGULARITY_BUILD_CLOSURE AND SINGULARITY_USE_SPINER)
add_executable(test_pte test_pte.cpp)
target_link_libraries(test_pte PRIVATE Catch2::Catch2
singularity-eos::singularity-eos)
Expand Down Expand Up @@ -85,8 +85,10 @@ if(SINGULARITY_BUILD_PYTHON AND SINGULARITY_TEST_PYTHON)
"${PYTHON_TEST_ENVIRONMENT}")
endif()

add_executable(profile_eos profile_eos.cpp)
target_link_libraries(profile_eos singularity-eos::singularity-eos)
if(SINGULARITY_USE_SPINER)
add_executable(profile_eos profile_eos.cpp)
target_link_libraries(profile_eos singularity-eos::singularity-eos)
endif()

if(SINGULARITY_USE_EOSPAC
AND SINGULARITY_TEST_SESAME
Expand Down

0 comments on commit e5706f1

Please sign in to comment.