aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-02-26 20:36:33 +0100
committerKristian Evers <kristianevers@gmail.com>2020-02-27 13:19:13 +0100
commita9bc6e5fb000f618c9df6276f4ef79063ce4cdfc (patch)
treefc9f7df9d9d237f42c49137e863a501717f8718e /cmake
parent8d665f20a743b136cb43943ff255ddadf1ead92d (diff)
downloadPROJ-a9bc6e5fb000f618c9df6276f4ef79063ce4cdfc.tar.gz
PROJ-a9bc6e5fb000f618c9df6276f4ef79063ce4cdfc.zip
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
Diffstat (limited to 'cmake')
-rw-r--r--cmake/ProjTest.cmake24
1 files changed, 6 insertions, 18 deletions
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()