Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Step 2 in splitting PR 3068 #3089

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Step 2 in splitting PR 3068 #3089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa3b8f7
Step 2 in splitting PR 3068
DennisHeimbigner Feb 11, 2025
4473755
Step 2 in splitting PR 3068
DennisHeimbigner Feb 11, 2025
58b4dfb
Update RELEASE_NOTES
DennisHeimbigner Feb 11, 2025
ab31b1c
fix test_hyrax.sh
DennisHeimbigner Feb 12, 2025
6b9dc4c
Suppress hyrax tests until reconciled
DennisHeimbigner Feb 12, 2025
98067db
Turn off Hyrax testing for DAP4
DennisHeimbigner Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Release Notes {#RELEASE_NOTES}

This file contains a high-level description of this package's evolution. Releases are in reverse chronological order (most recent first). Note that, as of netcdf 4.2, the `netcdf-c++` and `netcdf-fortran` libraries have been separated into their own libraries.

## 4.9.4 - TBD

* Step 2 in splitting PR [Github #3068](https://github.com/Unidata/netcdf-c/pull/3068). Fix a namespace problem in tinyxml2.cpp. Note that this is a visual studio problem hence use of _MSC_VER. Also turn off DAP4 tests against Hyrax server until DAP4 spec problems are fixed. See [Github #3089](https://github.com/Unidata/netcdf-c/pull/3089) for more information.

## 4.9.3 - February 7, 2025

## Known Issues
Expand Down
2 changes: 1 addition & 1 deletion dap4_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ENDIF()

IF(NETCDF_ENABLE_DAP_REMOTE_TESTS)
add_sh_test(dap4_test test_remote)
add_sh_test(dap4_test test_hyrax)
#Suppress until reconciled with hyrax: add_sh_test(dap4_test test_hyrax)
add_sh_test(dap4_test test_dap4url)
IF(RUN_MANUAL_TESTS)
# The following test can only be run by hand.
Expand Down
2 changes: 1 addition & 1 deletion dap4_test/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if NETCDF_ENABLE_DAP_REMOTE_TESTS

TESTS += test_remote.sh
TESTS += test_constraints.sh
TESTS += test_hyrax.sh
#Suppress until reconciled with hyrax: TESTS += test_hyrax.sh
TESTS += test_dap4url.sh

# The following test can only be run by hand.
Expand Down
4 changes: 3 additions & 1 deletion dap4_test/test_hyrax.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
if test "x$srcdir" = "x"; then srcdir=`dirname $0`; fi
export srcdir;


. ../test_common.sh

. ${srcdir}/d4test_common.sh
Expand Down Expand Up @@ -61,7 +62,8 @@ hyraxsplit() {
PREFIX=`dirname $P`
}

if test "x${RESET}" = x1 ; then rm -fr ${BASELINEHY}/*.hyrax ; fi
# Turn on only if regenerating test baseline
#if test "x${RESET}" = x1 ; then rm -fr ${BASELINEHY}/*.hyrax ; fi
for f in $F ; do
hyraxsplit $f
makehyraxurl
Expand Down
4 changes: 4 additions & 0 deletions libncxml/ncxml_tinyxml2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@

using namespace tinyxml2;

#ifdef _MSC_VER /*Do not use _WIN32 since this is a visual studio issue */
#define XMLDocument tinyxml2::XMLDocument
#endif

static int ncxml_initialized = 0;

void
Expand Down
Loading