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

Merge branch 'cmake-parallel-testing'

Browse Source
This commit is contained in:
Ward Fisher 2017-11-25 11:57:01 -07:00
commit 5163189f0c
9 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/C/CMakeLists.txt
View File

@ -8,13 +8,10 @@ FOREACH(F ${exam_C_tests})
add_bin_test(C_tests ${F})
ENDFOREACH()
## Specify files to be distributed by 'make dist'
FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am run_examples.sh run_examples4.sh)
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
SET_TESTS_PROPERTIES(C_tests_simple_xy_rd PROPERTIES DEPENDS C_tests_simple_xy_wr)
SET_TESTS_PROPERTIES(C_tests_sfc_pres_temp_rd PROPERTIES DEPENDS C_tests_sfc_pres_temp_wr)
SET_TESTS_PROPERTIES(C_tests_pres_temp_4D_rd PROPERTIES DEPENDS C_tests_pres_temp_4D_wr)
SET(CLEANFILES sfc_pres_temp.nc simple_xy.nc pres_temp_4D.nc simple_nc4.nc simple_xy_nc4.nc)
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEANFILES}")

9
examples/CDL/CMakeLists.txt
View File

@ -7,12 +7,11 @@ FOREACH(F ${CDL_EXAMPLE_TESTS})
add_sh_test(cdl ${F})
ENDFOREACH()
FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} simple_xy.cdl sfc_pres_temp.cdl pres_temp_4D.cdl CMakeLists.txt Makefile.am create_sample_files.sh do_comps.sh)
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
SET_TESTS_PROPERTIES(cdl_do_comps PROPERTIES DEPENDS cdl_create_sample_files)
SET_TESTS_PROPERTIES(cdl_do_comps PROPERTIES DEPENDS C_tests_simple_xy_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)
SET(CLEANFILES simple_xy.nc sfc_pres_temp.nc pres_temp_4D.nc)
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEANFILES}")

5
examples/CMakeLists.txt
View File

@ -3,8 +3,3 @@ ADD_SUBDIRECTORY(C)
IF(BUILD_UTILITIES)
ADD_SUBDIRECTORY(CDL)
ENDIF()
SET(CUR_EXTRA_DIST CMakeLists.txt Makefile.am)
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")

6
h5_test/CMakeLists.txt
View File

@ -13,8 +13,4 @@ FOREACH(CTEST ${H5TESTS})
ADD_TEST(${CTEST} ${EXECUTABLE_OUTPUT_PATH}/${CTEST})
ENDFOREACH()
FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} ref_tst_h_compounds.h5 ref_tst_h_compounds2.h5 ref_tst_compounds.nc CMakeLists.txt Makefile.am)
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
SET_TESTS_PROPERTIES(tst_h_rd_cmp PROPERTIES DEPENDS tst_h_wrt_cmp)

2
nc_test4/CMakeLists.txt
View File

@ -88,6 +88,8 @@ IF(USE_HDF4_FILE_TESTS AND NOT MSVC)
add_sh_test(nc_test4 run_chunk_hdf4)
add_bin_test(nc_test4 tst_h4_lendian)
add_sh_test(nc_test4 tst_hdf4_read_var)
SET_TESTS_PROPERTIES(nc_test4_tst_interops3 PROPERTIES DEPENDS nc_test4_run_get_hdf4_files)
ENDIF()
IF(TEST_PARALLEL4)

2
ncdump/CMakeLists.txt
View File

@ -176,7 +176,7 @@ ENDIF()
# is different, but the result is actually correct.
#IF(NOT MSVC)
add_sh_test(ncdump tst_netcdf4)
add_bin_test_no_prefix(tst_h_rdc0)
build_bin_test_no_prefix(tst_h_rdc0)
#ENDIF()
add_bin_test_no_prefix(tst_unicode)

7
ncdump/Makefile.am
View File

@ -2,7 +2,7 @@
# Copyright 2005, see the COPYRIGHT file for more information.
# This file builds and runs the ncdump program.
# Ed Hartnett, Dennis Heimbigner
# Ed Hartnett, Dennis Heimbigner, Ward Fisher
# Put together AM_CPPFLAGS and AM_LDFLAGS.
include $(top_srcdir)/lib_flags.am
@ -128,8 +128,8 @@ tst_charfill.cdl tst_charfill.sh tst_iter.sh tst_mud.sh \
ref_tst_mud4.cdl ref_tst_mud4-bc.cdl ref_tst_mud4_chars.cdl \
inttags.cdl inttags4.cdl ref_inttags.cdl ref_inttags4.cdl \
ref_tst_ncf213.cdl tst_h_scalar.sh run_utf8_nc4_tests.sh \
tst_formatx3.sh tst_formatx4.sh ref_tst_utf8_4.cdl tst_inttags.sh \
tst_inttags4.sh CMakeLists.txt XGetopt.c tst_bom.sh \
tst_formatx3.sh tst_formatx4.sh ref_tst_utf8_4.cdl ref_tst_nc4_utf8_4.cdl \
tst_inttags.sh tst_inttags4.sh CMakeLists.txt XGetopt.c tst_bom.sh \
tst_inmemory_nc3.sh tst_dimsizes.sh tst_inmemory_nc4.sh \
tst_fileinfo.sh run_ncgen_tests.sh ref_test_360_day_1900.nc \
ref_test_365_day_1900.nc ref_test_366_day_1900.nc \
@ -152,6 +152,7 @@ test1_ncdump.cdl test2_ncdump.cdl test1.cdl ctest1.cdl test1_cdf5.cdl \
test2_cdf5.cdl test1_offset.cdl test2_offset.cdl ctest0.nc \
ctest0_64.nc c1.cdl c1_4.cdl ctest1_64.cdl c0.nc c0_4.nc small.nc \
small2.nc c0tmp.nc c1.ncml utf8.cdl utf8_64.cdl utf8.nc utf8_64.nc \
nc4_utf8.cdl nc4_utf8.nc \
tst_unicode.cdl tst_group_data.cdl tst_compounds2.cdl tst_comp.cdl \
tst_enum_data.cdl tst_small.cdl tst_times.cdl tst_solar_2.cdl \
tst_string_data.cdl tst_fillbug.cdl tst_opaque_data.cdl \

24
ncdump/ref_tst_nc4_utf8_4.cdl Normal file
View File

@ -0,0 +1,24 @@
netcdf nc4_utf8 {
dimensions:
xā = 2 ;
㼿y = 2 ;
Καλημέρα = 18 ;
variables:
int 􍐪(xā, 㼿y) ;
char Καλημέρα(Καλημέρα) ;
Καλημέρα:units = "Καλημέρα" ;
string s(xā);
string s:satt = "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ";
// global attributes:
:Gā = "ā㼿y􍐪" ;
data:
􍐪 =
1, 2,
3, 4 ;
Καλημέρα = "\316\232\316\261\316\273\316\267\316\274\341\275\263\317\201\316\261" ;
s = "キャク", "龥";
}

10
ncdump/run_utf8_nc4_tests.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
. ../test_common.sh
@ -12,9 +12,9 @@ set -e
echo ""
rm -f utf8.nc utf8.cdl
rm -f nc4_utf8.nc nc4_utf8.cdl
echo "*** creating enhanced file with utf8 characters..."
${NCGEN} -4 -b -o utf8.nc ${srcdir}/ref_tst_utf8_4.cdl
${NCGEN} -4 -b -o nc4_utf8.nc ${srcdir}/ref_tst_nc4_utf8_4.cdl
echo "*** dump and compare utf8 output..."
${NCDUMP} utf8.nc > utf8.cdl
diff -b -w utf8.cdl ${srcdir}/ref_tst_utf8_4.cdl
${NCDUMP} nc4_utf8.nc > nc4_utf8.cdl
diff -b -w nc4_utf8.cdl ${srcdir}/ref_tst_nc4_utf8_4.cdl