eliminated dependencies

This commit is contained in:
Ed Hartnett 2017-11-25 05:18:04 -07:00
parent e064855a10
commit fa690cd0d8
2 changed files with 32 additions and 35 deletions

View File

@ -1,20 +1,18 @@
#!/bin/sh
# This script runs UTF-8 tests for netCDF-4.
# Ward Fisher, Dennis Heimbigner, Ed Hartnett
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
. ../test_common.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
echo ""
echo "*** Testing netcdf-4 file with utf8 characters..."
rm -f utf8.nc utf8.cdl
echo "*** creating enhanced file with utf8 characters..."
${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 tst_utf8_nc4.nc tst_utf8_nc4.cdl
${NCGEN} -4 -b -o tst_utf8_nc4.nc ${srcdir}/ref_tst_utf8_4.cdl
${NCDUMP} -n 'utf8' tst_utf8_nc4.nc > tst_utf8_nc4.cdl
diff -b -w tst_utf8_nc4.cdl ${srcdir}/ref_tst_utf8_4.cdl
echo "*** NetCDF-4 UTF8 testing passed!"
exit 0

View File

@ -1,44 +1,43 @@
# This shell script runs ncdump tests relating to the new UTF8 name stuff.
# Russ Rew, Dennis Heimbigner, Ward Fisher, Ed Hartnett
#!/bin/sh
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
. ../test_common.sh
# This shell script runs ncdump tests relating to the new UTF8 name stuff.
set -e
echo ""
echo "*** Testing ncgen and ncdump for UTF8 support..."
# Run tst_utf8.c to produce test file tst_utf8.nc.
${execdir}/tst_utf8
if test "x$builddir" = x ; then
builddir="."
fi
if test "x$srcdir" = x ; then
srcdir="."
fi
# if test "x$builddir" = x ; then
# builddir="."
# fi
# if test "x$srcdir" = x ; then
# srcdir="."
# fi
rm -f utf8.nc utf8.cdl
rm -f tst_utf8_nc3.nc tst_utf8_nc3.cdl
echo "*** creating classic offset file with utf8 characters..."
${NCGEN} -b -o utf8.nc ${srcdir}/ref_tst_utf8.cdl
${NCGEN} -b -o tst_utf8_nc3.nc ${srcdir}/ref_tst_utf8.cdl
echo "*** dump and compare utf8 output..."
${NCDUMP} utf8.nc > utf8.cdl
diff -b -w utf8.cdl ${srcdir}/ref_tst_utf8.cdl
${NCDUMP} -n utf8 tst_utf8_nc3.nc > tst_utf8_nc3.cdl
diff -b -w tst_utf8_nc3.cdl ${srcdir}/ref_tst_utf8.cdl
rm -f utf8.nc utf8.cdl
rm -f tst_utf8_64.nc tst_utf8_64.cdl
echo "*** creating 64-bit offset file with utf8 characters..."
${NCGEN} -k 64-bit-offset -b -o utf8.nc ${srcdir}/ref_tst_utf8.cdl
${NCGEN} -k 64-bit-offset -b -o tst_utf8_64.nc ${srcdir}/ref_tst_utf8.cdl
echo "*** (64 bit) dump and compare utf8 output..."
${NCDUMP} utf8.nc > utf8.cdl
diff -b -w utf8.cdl ${srcdir}/ref_tst_utf8.cdl
${NCDUMP} -n utf8 tst_utf8_64.nc > tst_utf8_64.cdl
diff -b -w tst_utf8_64.cdl ${srcdir}/ref_tst_utf8.cdl
echo "*** dumping tst_utf8.nc to tst_utf8.cdl..."
rm -f tst8.cdl
sed -e 's/^netcdf tst_unicode/netcdf tst_utf8/' <${srcdir}/ref_tst_unicode.cdl >tst8.cdl
${NCDUMP} tst_utf8.nc > tst_utf8.cdl
echo "*** comparing tst_utf8.cdl with tst8.cdl..."
diff -b -w tst_utf8.cdl tst8.cdl
rm -f tst8.cdl result
rm -f tst_tst8.cdl tst_utf8_tst8.cdl
sed -e 's/^netcdf tst_unicode/netcdf tst_utf8/' <${srcdir}/ref_tst_unicode.cdl > tst_tst8.cdl
${NCDUMP} tst_utf8.nc > tst_utf8_tst8.cdl
echo "*** comparing tst_utf8_tst8.cdl with tst_tst8.cdl..."
diff -b -w tst_utf8_tst8.cdl tst_tst8.cdl
echo "*** All utf8 tests of ncgen and ncdump passed!"
exit 0