Skip to content

Commit

Permalink
dfalttest
Browse files Browse the repository at this point in the history
  • Loading branch information
DennisHeimbigner committed Sep 30, 2024
1 parent 1a56f96 commit 05ec169
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main-cmake.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: NetCDF-C CMake CI - Windows

on: [ pull_request, workflow_dispatch]
on: [push, pull_request, workflow_dispatch]

env:
REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

name: Run macOS-based netCDF Tests

on: [pull_request,workflow_dispatch]
on: [push,pull_request,workflow_dispatch]

concurrency:
group: ${{ github.workflow}}-${{ github.head_ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

name: Run Ubuntu/Linux netCDF Tests

on: [pull_request,workflow_dispatch]
on: [push,pull_request,workflow_dispatch]

env:
REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_win_cygwin.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Run Cygwin-based tests

on: [pull_request,workflow_dispatch]
on: [push,pull_request,workflow_dispatch]

concurrency:
group: ${{ github.workflow}}-${{ github.head_ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_win_mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
CPPFLAGS: "-D_BSD_SOURCE"
REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }}

on: [pull_request,workflow_dispatch]
on: [push,pull_request,workflow_dispatch]

concurrency:
group: ${{ github.workflow}}-${{ github.head_ref }}
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ endif()
if((NOT DEFINED HDF5_PLUGIN_PATH) OR ("${HDF5_PLUGIN_PATH}" STREQUAL ""))
if(ISMSVC OR ISMINGW)
string(REPLACE "\\" "/" AUP "$ENV{ALLUSERSPROFILE}")
set(HDF5_PLUGIN_PATH "${AUP}/hdfd5/lib/plugin")
set(HDF5_PLUGIN_PATH "${AUP}/hdf5/lib/plugin")
else()
set(HDF5_PLUGIN_PATH "/usr/local/hdf5/lib/plugin")
endif()
Expand Down
2 changes: 2 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ This file contains a high-level description of this package's evolution. Release

## 4.9.3 - TBD

* Extend the netcdf API to support programmatic changes to the plugin search path. See [Github #????](https://github.com/Unidata/netcdf-c/pull/????) for more information.

## Known Issue

> Parallel operation using `mpich 4.2.0` (the default on `Ubuntu 24.04`) results in 'unexpected results' when running `nc_test4/run_par_test.sh`. This can be fixed by removing `mpich` and associated libraries and development packages and installing `mpich 4.2.2` by hand, or by using `openmpi` provided via `apt`.
Expand Down
19 changes: 11 additions & 8 deletions unit_test/run_dfaltpluginpath.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,32 @@
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
. ../test_common.sh

set -e

#CMD="valgrind --leak-check=full"

TESTHPP="/tmp;${HOME}"

FAIL=

# Test with no HDF5_PLUGIN_PATH
unset HDF5_PLUGIN_PATH
NOHPP1=`ncpluginpath -f global`
if test "x$NOHPP1" = "" || test "x$NOHPP1" = "" ; then
if test "x$NOHPP1" = "x/usr/local/hdf5/lib/plugin" || test "x$NOHPP1" = "xC:ProgramData/hdf5/lib/plugin" ; then
echo "***PASS: default plugin path = |$NOHPP1|"
else
FAIL=1
echo "***FAIL: default plugin path = |$NOHPP1|"
fi
exit

# Test with given HDF5_PLUGIN_PATH
unset HDF5_PLUGIN_PATH
export HDF5_PLUGIN_PATH="$TESTHPP"
HPP1=`ncpluginpath -f global`
if test "x$HPP1" = "$TESTHPP" ; then
if test "x$HPP1" = "x$TESTHPP" ; then
echo "***PASS: default plugin path: |$HPP1| HDF5_PLUGIN_PATH=|$HDF5_PLUGIN_PATH|"
else
echo "***PASS: default plugin path: |$HPP1| HDF5_PLUGIN_PATH=|"$HDF5_PLUGIN_PATH|"
FAIL=1
echo "***FAIL: default plugin path: |$HPP1| HDF5_PLUGIN_PATH=|$HDF5_PLUGIN_PATH|"
fi
echo "***FAIL: default plugin path: |$HPP1| HDF5_PLUGIN_PATH=|"$HDF5_PLUGIN_PATH|"
exit

if test "x$FAIL" != x ; then exit 1; fi
exit 0

0 comments on commit 05ec169

Please sign in to comment.