From a9bc6e5fb000f618c9df6276f4ef79063ce4cdfc Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Feb 2020 20:36:33 +0100 Subject: Make tests independent of proj-datumgrid Fixes #1984 - Copy BETA2007.gsb, MD, alaska, conus, ntf_r93.gsb, ntv1_can.dat grids from proj-datumgrid to data/tests. - Replace a couple uses of nzgd2kgrid0005.gsb in tests by ntf_r93.gsb - Add downsampled/subsetted versions of egm96_15.gtx as tests/egm96_15_downsampled.gtx and ntv2_0.gsb as tests/ntv2_0_downsampled.gsb This results in a few changes in expected results - Simpify travis/install.sh due to less configurations to test This results in a hopefully acceptable increase of the proj-X.Y.Z.tar.gz from 2.9 to 5.3 MB --- cmake/ProjTest.cmake | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'cmake/ProjTest.cmake') diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake index 8930a561..04f40c5d 100644 --- a/cmake/ProjTest.cmake +++ b/cmake/ProjTest.cmake @@ -11,24 +11,12 @@ function(proj_add_test_script_sh SH_NAME BIN_USE) if(UNIX) get_filename_component(testname ${SH_NAME} NAME_WE) - set(TEST_OK 1) - if(ARGV2) - set(TEST_OK 0) - set(GRID_FULLNAME ${PROJECT_SOURCE_DIR}/data/${ARGV2}) - if(EXISTS ${GRID_FULLNAME}) - set(TEST_OK 1) - endif() - endif() - - if(${TEST_OK}) - add_test(NAME "${testname}" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data - COMMAND bash ${PROJECT_SOURCE_DIR}/test/cli/${SH_NAME} - ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}} - ) - - proj_test_set_properties(${testname}) - endif() + add_test(NAME "${testname}" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data + COMMAND bash ${PROJECT_SOURCE_DIR}/test/cli/${SH_NAME} + ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}} + ) + proj_test_set_properties(${testname}) endif() endfunction() -- cgit v1.2.3