Merge topic 'fix-git-lfs-test'

e6f86c2ad Only check sentinel-data if testing is enabled
9ad4ad721 Add content to sentinel-data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2022
This commit is contained in:
Kenneth Moreland 2020-04-02 19:22:40 +00:00 committed by Kitware Robot
commit 48e4446f7d
2 changed files with 10 additions and 8 deletions

@ -161,12 +161,14 @@ include(VTKmCompilerFlags)
#-----------------------------------------------------------------------------
# We need to check and see if git lfs is installed so that test data will
# be available for use
file(READ "${VTKm_SOURCE_DIR}/data/data/sentinel-data" data)
if (NOT data STREQUAL "\n")
message(WARNING
"Testing is enabled, but the data is not available. Use git lfs in order "
" to obtain the testing data.")
set(VTKm_ENABLE_TESTING off)
if (VTKm_ENABLE_TESTING)
file(STRINGS "${VTKm_SOURCE_DIR}/data/data/sentinel-data" sentinel_data LIMIT_COUNT 1)
if (NOT sentinel_data STREQUAL "-- DO NOT MODIFY THIS LINE --")
message(WARNING
"Testing is enabled, but the data is not available. Use git lfs in order "
"to obtain the testing data.")
set(VTKm_ENABLE_TESTING off)
endif()
endif()
# We include the wrappers unconditionally as VTK-m expects the function to

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
size 1
oid sha256:cac2600b02c8352270d8251718cd8effddb6c78d133f1fd0f08b1bccb0eac51d
size 121