Skip to content

Commit

Permalink
Merge pull request #2682 from DennisHeimbigner/ncdumptests.dmh
Browse files Browse the repository at this point in the history
Fix some dependency conditions between some ncdump tests.
  • Loading branch information
WardF committed Jun 7, 2023
2 parents a082acc + 3695cc0 commit c44508b
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 9 deletions.
7 changes: 4 additions & 3 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,20 @@ This file contains a high-level description of this package's evolution. Release

## 4.9.3 - TBD

* Fix a race condition in some ncdump tests. See [Github #2682](https://github.com/Unidata/netcdf-c/pull/2682).
* Fix a minor bug in reporting the use of szip. See [Github #2679](https://github.com/Unidata/netcdf-c/pull/2679).
* Simplify the handling of XGetopt. See [Github #2678](https://github.com/Unidata/netcdf-c/pull/2678).
* Improve performance and testing of the new nc_reclaim/copy functions. See [Github #2699](https://github.com/Unidata/netcdf-c/pull/2699).
* [Bug Fix] Provide a partial fix to the libcurl certificates problem. See [Github #2690](https://github.com/Unidata/netcdf-c/pull/2690).
* Improve S3 documentation, testing, and support See [Github #2686](https://github.com/Unidata/netcdf-c/pull/2686).
* Remove obsolete code. See [Github #2680](https://github.com/Unidata/netcdf-c/pull/2680).
* [Bug Fix] Add a crude test to see if an NCZarr path looks like a valid NCZarr/Zarr file. See [Github #2658](https://github.com/Unidata/netcdf-c/pull/2658).
* Fix 'make distcheck' error in run_interop.sh. See [Github #2631](https://github.com/Unidata/netcdf-c/pull/2631).

## 4.9.2 - March 14, 2023

This is the maintenance release which adds support for HDF5 version 1.14.0, in addition to a handful of other changes and bugfixes.

* Fix 'make distcheck' error in run_interop.sh. See [Github #2631](https://github.com/Unidata/netcdf-c/pull/2631).
* Fix a minor bug in reporting the use of szip. See [Github #2679](https://github.com/Unidata/netcdf-c/pull/2679).
* Simplify the handling of XGetopt. See [Github #2678](https://github.com/Unidata/netcdf-c/pull/2678).
* Update `nc-config` to remove inclusion from automatically-detected `nf-config` and `ncxx-config` files, as the wrong files could be included in the output. This is in support of [GitHub #2274](https://github.com/Unidata/netcdf-c/issues/2274).
* Update H5FDhttp.[ch] to work with HDF5 version 1.13.2 and later. See [Github #2635](https://github.com/Unidata/netcdf-c/pull/2635).
* [Bug Fix] Update DAP code to enable CURLOPT_ACCEPT_ENCODING by default. See [Github #2630](https://github.com/Unidata/netcdf-c/pull/2630).
Expand Down
12 changes: 12 additions & 0 deletions ncdump/test_ncdump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,16 @@ ${execdir}/tst_fillbug
${NCDUMP} tst_fillbug.nc > tst_fillbug.cdl
# echo "*** comparing tst_fillbug.cdl with ref_tst_fillbug.cdl..."
diff -b tst_fillbug.cdl $srcdir/ref_tst_fillbug.cdl


}

NCDUMPPATH=${builddir}
if test "x$NCDUMPDIR" != x ; then
NCDUMPPATH="${NCDUMPPATH}/$NCDUMPDIR"
rm -fr $NCDUMPPATH
mkdir $NCDUMPPATH
fi
find $NCDUMPPATH


7 changes: 4 additions & 3 deletions ncdump/tst_nccopy4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
. ../test_common.sh


. $srcdir/test_ncdump.sh

isolate "testdir_ncdump_nccopy4"
NCDUMPDIR="testdir_ncdump_nccopy4"
. $srcdir/test_ncdump.sh

# Move into test directory
cd $ISOPATH
cd $NCDUMPPATH


set -e

Expand Down
7 changes: 4 additions & 3 deletions ncdump/tst_netcdf4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
. ../test_common.sh


NCDUMPDIR="testdir_ncdump_netcdf4"
. $srcdir/test_ncdump.sh

isolate "testdir_ncdump_netcdf4"
# Move into test directory
cd $NCDUMPPATH

# Move into isolation directory
cd $ISOPATH

set -e

Expand Down

0 comments on commit c44508b

Please sign in to comment.