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

Merge branch 'master' into sync

Browse Source
This commit is contained in:
dmh 2015-10-22 15:35:29 -06:00
commit 7630d87c63
5 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
git_bisect_test.sh Executable file
View File

@ -0,0 +1,13 @@
#!/bin/bash
rm -f build
mkdir build
pushd build
cmake .. -DENABLE_NETCDF_4=OFF -DENABLE_DAP=OFF -DENABLE_DISKLESS=OFF
make -j 4
cd ncdump
./tst_nccopy3.sh
RES=$?
popd
exit $RES

5
ncdump/CMakeLists.txt
View File

@ -87,7 +87,12 @@ ENDIF()
add_sh_test(ncdump tst_lengths)
add_sh_test(ncdump tst_calendars)
add_bin_test(ncdump tst_utf8)
add_sh_test(ncdump run_utf8_tests)
IF(USE_NETCDF4)
add_sh_test(ncdump run_utf8_nc4_tests)
ENDIF(USE_NETCDF4)
add_sh_test(ncdump tst_nccopy3)
add_sh_test(ncdump tst_charfill)

2
ncdump/Makefile.am
View File

@ -53,7 +53,7 @@ tst_string_data tst_vlen_data tst_comp tst_comp2 tst_nans \
tst_special_atts tst_netcdf4.sh tst_h_rdc0 tst_unicode tst_fillbug \
tst_fillbug.sh tst_netcdf4_4.sh tst_compress tst_nccopy4.sh \
tst_grp_spec.sh tst_mud.sh tst_h_scalar tst_h_scalar.sh tst_formatx4.sh \
tst_bug324
tst_bug324 run_utf8_nc4_tests.sh
if EXTRA_TESTS
TESTS += run_back_comp_tests.sh

18
ncdump/run_utf8_nc4_tests.sh Executable file
View File

@ -0,0 +1,18 @@
#!/bin/sh
#
# Moving some netcdf-4 only tests here, out of tst_nccopy and run_utf8_tests.
# Without this, the tests fail when netcdf-4 is disabled.
set -e
if test "x$srcdir" = "x"; then
srcdir=`dirname $0`;
fi
export srcdir
echo ""
rm -f utf8.nc utf8.cdl
echo "*** creating enhanced file with utf8 characters..."
../ncgen/ncgen -4 -b -o utf8.nc ${srcdir}/ref_tst_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

7
ncdump/run_utf8_tests.sh
View File

@ -20,13 +20,6 @@ echo "*** dump and compare utf8 output..."
./ncdump utf8.nc > utf8.cdl
diff -b -w utf8.cdl ${srcdir}/ref_tst_utf8.cdl
rm -f utf8.nc utf8.cdl
echo "*** creating enhanced file with utf8 characters..."
../ncgen/ncgen -4 -b -o utf8.nc ${srcdir}/ref_tst_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
rm -f utf8.nc utf8.cdl
echo "*** creating 64-bit offset file with utf8 characters..."
../ncgen/ncgen -k 64-bit-offset -b -o utf8.nc ${srcdir}/ref_tst_utf8.cdl