mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-12-21 08:39:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ejh_fix_par_builds' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into v4.6.2-release-branch.wif

Browse Source
This commit is contained in:
Ward Fisher 2018-11-19 14:59:04 -07:00
commit 6b919fc048
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ncdump/Makefile.am
View File

@ -143,7 +143,7 @@ EXTRA_DIST += L512.bin
SUBDIRS = cdl expected SUBDIRS = cdl expected
CLEANFILES = tst_*.nc tmp*.nc test*.nc iter.* tmp*.cdl \ CLEANFILES = tst_*.nc tmp*.nc test*.nc iter.* tmp*.cdl \
tst_output_*.cdl tst_output_*.c tst_utf8_*.cdl tst_tst8.cdl \ tst_output_*.cdl tst_output_*.c tst_utf8_*.cdl *.tmp tst_tst8.cdl \
tst_netcdf4_*.cdl test1_ncdump.cdl test2_ncdump.cdl test1.cdl \ tst_netcdf4_*.cdl test1_ncdump.cdl test2_ncdump.cdl test1.cdl \
ctest1.cdl test1_cdf5.cdl test2_cdf5.cdl test1_offset.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 \ test2_offset.cdl ctest0.nc ctest0_64.nc c1.cdl c1_4.cdl ctest1_64.cdl \
@ -163,4 +163,4 @@ compound_datasize_test.nc compound_datasize_test2.nc ncf199.nc \
tst_c0.cdl tst_c0_4.cdl tst_c0_4c.cdl tst_c0_64.cdl \ tst_c0.cdl tst_c0_4.cdl tst_c0_4c.cdl tst_c0_64.cdl \
tst_compound_datasize_test.cdl tst_compound_datasize_test2.cdl \ tst_compound_datasize_test.cdl tst_compound_datasize_test2.cdl \
tst_ncf199.cdl tst_tst_gattenum.cdl tst_tst_usuffix.cdl ctest.c \ tst_ncf199.cdl tst_tst_gattenum.cdl tst_tst_usuffix.cdl ctest.c \
ctest64.c nccopy3_subset_out.nc camrun.c ctest64.c nccopy3_subset_out.nc camrun.c tst_ncf213.cdl tst_ncf213.nc

4
ncdump/tst_netcdf4_4.sh
View File

@ -74,10 +74,6 @@ cleanncprops ${srcdir}/ref_tst_ncf213.cdl ref_tst_ncf213.tmp
ok=1; ok=1;
if diff -b tst_ncf213.tmp ref_tst_ncf213.tmp ; then ok=1; else ok=0; fi if diff -b tst_ncf213.tmp ref_tst_ncf213.tmp ; then ok=1; else ok=0; fi
# cleanup
#rm -f tst_ncf213.cdl tst_ncf213.nc
rm -f *.tmp
if test $ok = 0 ; then if test $ok = 0 ; then
echo "*** FAIL: NCF-213 Bug Fix test" echo "*** FAIL: NCF-213 Bug Fix test"
exit 1 exit 1