mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-05 16:20:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into inmemory.dmh

Browse Source
This commit is contained in:
Dennis Heimbigner 2018-04-27 11:25:46 -06:00
commit b9cb89a959
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/CDL/CMakeLists.txt
View File

@ -7,9 +7,11 @@ FOREACH(F ${CDL_EXAMPLE_TESTS})
add_sh_test(cdl ${F}) add_sh_test(cdl ${F})
ENDFOREACH() ENDFOREACH()
SET_TESTS_PROPERTIES(cdl_do_comps PROPERTIES DEPENDS C_tests_simple_xy_wr) IF(HAVE_BASH)
SET_TESTS_PROPERTIES(cdl_do_comps PROPERTIES DEPENDS C_tests_sfc_pres_temp_wr) SET_TESTS_PROPERTIES(cdl_do_comps PROPERTIES DEPENDS C_tests_simple_xy_wr)
SET_TESTS_PROPERTIES(cdl_do_comps PROPERTIES DEPENDS C_test_pres_temp_4D_wr) SET_TESTS_PROPERTIES(cdl_do_comps PROPERTIES DEPENDS C_tests_sfc_pres_temp_wr)
SET_TESTS_PROPERTIES(cdl_do_comps PROPERTIES DEPENDS C_test_pres_temp_4D_wr)
ENDIF(HAVE_BASH)
SET(CLEANFILES simple_xy.nc sfc_pres_temp.nc pres_temp_4D.nc) SET(CLEANFILES simple_xy.nc sfc_pres_temp.nc pres_temp_4D.nc)
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEANFILES}") SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEANFILES}")

16
ncdump/CMakeLists.txt
View File

@ -121,7 +121,9 @@ ENDIF(MSVC)
ENDIF(USE_STRICT_NULL_BYTE_HEADER_PADDING) ENDIF(USE_STRICT_NULL_BYTE_HEADER_PADDING)
add_sh_test(ncdump tst_nccopy3) add_sh_test(ncdump tst_nccopy3)
SET_TESTS_PROPERTIES(ncdump_tst_nccopy3 PROPERTIES RUN_SERIAL TRUE) IF(HAVE_BASH)
SET_TESTS_PROPERTIES(ncdump_tst_nccopy3 PROPERTIES RUN_SERIAL TRUE)
ENDIF(HAVE_BASH)
add_sh_test(ncdump tst_nccopy3_subset) add_sh_test(ncdump tst_nccopy3_subset)
add_sh_test(ncdump tst_charfill) add_sh_test(ncdump tst_charfill)
@ -189,9 +191,11 @@ ENDIF(MSVC)
add_sh_test(ncdump_sh tst_fillbug) add_sh_test(ncdump_sh tst_fillbug)
add_sh_test(ncdump tst_netcdf4_4) add_sh_test(ncdump tst_netcdf4_4)
IF(MSVC) IF(HAVE_BASH)
SET_TESTS_PROPERTIES(ncdump_tst_netcdf4_4 PROPERTIES WILL_FAIL TRUE) IF(MSVC)
ENDIF(MSVC) SET_TESTS_PROPERTIES(ncdump_tst_netcdf4_4 PROPERTIES WILL_FAIL TRUE)
ENDIF(MSVC)
ENDIF(HAVE_BASH)
### ###
# Some test reordering was required to ensure these tests # Some test reordering was required to ensure these tests
@ -207,7 +211,9 @@ ENDIF(MSVC)
add_sh_test(ncdump_shell tst_h_scalar) add_sh_test(ncdump_shell tst_h_scalar)
add_sh_test(ncdump tst_nccopy4) add_sh_test(ncdump tst_nccopy4)
SET_TESTS_PROPERTIES(ncdump_tst_nccopy4 PROPERTIES RUN_SERIAL TRUE) IF(HAVE_BASH)
SET_TESTS_PROPERTIES(ncdump_tst_nccopy4 PROPERTIES RUN_SERIAL TRUE)
ENDIF(HAVE_BASH)
IF(USE_NETCDF4) IF(USE_NETCDF4)
add_sh_test(ncdump tst_ncgen4) add_sh_test(ncdump tst_ncgen4)

4
nctest/CMakeLists.txt
View File

@ -14,4 +14,6 @@ ADD_TEST(nctest ${EXECUTABLE_OUTPUT_PATH}/nctest)
add_bin_test_no_prefix(tst_rename) add_bin_test_no_prefix(tst_rename)
add_sh_test(nctest compare_test_files) add_sh_test(nctest compare_test_files)
SET_TESTS_PROPERTIES(nctest_compare_test_files PROPERTIES DEPENDS nctest) IF(HAVE_BASH)
SET_TESTS_PROPERTIES(nctest_compare_test_files PROPERTIES DEPENDS nctest)
ENDIF(HAVE_BASH)