Skip to content

BP5 tests: Only run them if ADIOS2 has BP5 #1262

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

Merged
merged 2 commits into from
May 3, 2022
Merged

BP5 tests: Only run them if ADIOS2 has BP5 #1262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32c73e6
Revert "CI: Fix ADIOS 2.7.1 on Windows (#1258)"
franzpoeschel Apr 29, 2022
84cc2de
Use ADIOS2_HAVE_BP5 to enable BP5 tests
franzpoeschel Apr 29, 2022
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
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ install:
# Configure the VM.
- cmd: conda install -n root --quiet --yes numpy cmake hdf5 python=%CONDA_PY%
# ADIOS2 build only for 64bit Windows
- cmd: if "%TARGET_ARCH%"=="x64" conda install -n root --quiet --yes adios2==2.7.1 python=%CONDA_PY%
- cmd: if "%TARGET_ARCH%"=="x64" conda install -n root --quiet --yes adios2 python=%CONDA_PY%

before_build:
- cmd: cd C:\projects\openpmd-api
Expand Down
10 changes: 2 additions & 8 deletions test/SerialIOTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5159,10 +5159,7 @@ TEST_CASE("iterate_nonstreaming_series", "[serial][adios2]")
backend.extension,
false,
backend.jsonBaseConfig());
#if openPMD_HAVE_ADIOS2 && \
ADIOS2_VERSION_MAJOR * 1000000000 + ADIOS2_VERSION_MINOR * 100000000 + \
ADIOS2_VERSION_PATCH * 1000000 + ADIOS2_VERSION_TWEAK >= \
2701001223
#if openPMD_HAVE_ADIOS2 && defined(ADIOS2_HAVE_BP5)
if (backend.extension == "bp")
{
iterate_nonstreaming_series(
Expand All @@ -5188,10 +5185,7 @@ TEST_CASE("iterate_nonstreaming_series", "[serial][adios2]")
#endif
}

#if openPMD_HAVE_ADIOS2 && \
ADIOS2_VERSION_MAJOR * 1000000000 + ADIOS2_VERSION_MINOR * 100000000 + \
ADIOS2_VERSION_PATCH * 1000000 + ADIOS2_VERSION_TWEAK >= \
2701001223
#if openPMD_HAVE_ADIOS2 && defined(ADIOS2_HAVE_BP5)
void adios2_bp5_no_steps(bool usesteps)
{
std::string const config = R"END(
Expand Down