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

Merge branch 'v4.5.0-release-branch' into gh425

Browse Source
This commit is contained in:
Ward Fisher 2017-09-01 12:02:35 -06:00
commit 0119b7f83b
4 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ncdump/CMakeLists.txt
View File

@ -131,6 +131,7 @@ ENDIF()
ENDIF(USE_NETCDF4)
add_sh_test(ncdump tst_nccopy3)
add_sh_test(ncdump tst_nccopy3_subset)
add_sh_test(ncdump tst_charfill)
add_sh_test(ncdump tst_formatx3)

8
ncdump/Makefile.am
View File

@ -43,7 +43,7 @@ check_PROGRAMS = rewrite-scalar ctest ctest64 ncdump tst_utf8 bom tst_dimsizes n
TESTS = tst_inttags.sh run_tests.sh tst_64bit.sh ctest ctest64 tst_output.sh \
tst_lengths.sh tst_calendars.sh tst_utf8 run_utf8_tests.sh \
tst_nccopy3.sh tst_charfill.sh tst_iter.sh tst_formatx3.sh tst_bom.sh \
tst_nccopy3.sh tst_nccopy3_subset.sh tst_charfill.sh tst_iter.sh tst_formatx3.sh tst_bom.sh \
tst_dimsizes.sh run_ncgen_tests.sh
if USE_NETCDF4
@ -164,12 +164,12 @@ 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_inmemory_nc3.sh \
tst_dimsizes.sh tst_inmemory_nc4.sh tst_fileinfo.sh run_ncgen_tests.sh \
run_ncgen_nc4_tests.sh
run_ncgen_nc4_tests.sh tst_nccopy3_subset.sh ref_nccopy3_subset.nc
# CDL files and Expected results
SUBDIRS=cdl expected
EXTRA_DIST += tst_ncgen_shared.sh tst_ncgen4.sh tst_ncgen4_classic.sh \
tst_ncgen4_diff.sh tst_ncgen4_cycle.sh ref_ctest.c ref_ctest64.c
tst_ncgen4_diff.sh tst_ncgen4_cycle.sh ref_ctest.c ref_ctest64.c \
CLEANFILES += results/*.nc results/*.dmp results/*.dmp2 tmp*.cdl \
c5.nc compound_datasize_test.nc compound_datasize_test2.nc \
@ -177,7 +177,7 @@ CLEANFILES += results/*.nc results/*.dmp results/*.dmp2 tmp*.cdl \
tst_c0_64.cdl tst_compound_datasize_test.cdl \
tst_compound_datasize_test2.cdl tst_gattenum.nc \
tst_ncf199.cdl tst_tst_gattenum.cdl tst_tst_usuffix.cdl \
tst_usuffix.nc tst_bug324.nc
tst_usuffix.nc tst_bug324.nc nccopy3_subset_out.nc
DISTCLEANFILES = results

BIN
ncdump/ref_nccopy3_subset.nc Normal file
View File

Binary file not shown.

41
ncdump/tst_nccopy3_subset.sh Normal file
View File

@ -0,0 +1,41 @@
#!/bin/bash
#
# Added in support of https://github.com/Unidata/netcdf-c/gh425 and
# https://github.com/Unidata/netcdf-c/gh469
#
# The output isn't validated, but the regression it is fixing fails on nccopy.
#
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
. ../test_common.sh
# For a netCDF-3 build, test nccopy on netCDF files in this directory
set -e
echo ""
INFILE=ref_nccopy3_subset.nc
OUTFILE=nccopy3_subset_out.nc
echo "*** Testing netCDF-3 nccopy -v/-V flags on $IN"
echo "*** One Dimensional Tests"
echo "*** Testing nccopy -v"
${NCCOPY} -v lat ${INFILE} ${OUTFILE}
echo "*** Testing nccopy -V"
${NCCOPY} -V lat ${INFILE} ${OUTFILE}
echo "*** Two Dimensional Tests"
echo "*** Testing nccopy -v"
${NCCOPY} -v lat_2D_rct ${INFILE} ${OUTFILE}
echo "*** Testing nccopy -V"
${NCCOPY} -V lat_2D_rct ${INFILE} ${OUTFILE}
echo "nccopy passed!"
exit 0