Skip to content

Commit feefb0e

Browse files
BP5 tests: Only run them if ADIOS2 has BP5 (#1262)
* Revert "CI: Fix ADIOS 2.7.1 on Windows (#1258)" This reverts commit 87b2747. * Use ADIOS2_HAVE_BP5 to enable BP5 tests
1 parent d12bd7a commit feefb0e

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ install:
8888
# Configure the VM.
8989
- cmd: conda install -n root --quiet --yes numpy cmake hdf5 python=%CONDA_PY%
9090
# ADIOS2 build only for 64bit Windows
91-
- cmd: if "%TARGET_ARCH%"=="x64" conda install -n root --quiet --yes adios2==2.7.1 python=%CONDA_PY%
91+
- cmd: if "%TARGET_ARCH%"=="x64" conda install -n root --quiet --yes adios2 python=%CONDA_PY%
9292

9393
before_build:
9494
- cmd: cd C:\projects\openpmd-api

test/SerialIOTest.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5159,10 +5159,7 @@ TEST_CASE("iterate_nonstreaming_series", "[serial][adios2]")
51595159
backend.extension,
51605160
false,
51615161
backend.jsonBaseConfig());
5162-
#if openPMD_HAVE_ADIOS2 && \
5163-
ADIOS2_VERSION_MAJOR * 1000000000 + ADIOS2_VERSION_MINOR * 100000000 + \
5164-
ADIOS2_VERSION_PATCH * 1000000 + ADIOS2_VERSION_TWEAK >= \
5165-
2701001223
5162+
#if openPMD_HAVE_ADIOS2 && defined(ADIOS2_HAVE_BP5)
51665163
if (backend.extension == "bp")
51675164
{
51685165
iterate_nonstreaming_series(
@@ -5188,10 +5185,7 @@ TEST_CASE("iterate_nonstreaming_series", "[serial][adios2]")
51885185
#endif
51895186
}
51905187

5191-
#if openPMD_HAVE_ADIOS2 && \
5192-
ADIOS2_VERSION_MAJOR * 1000000000 + ADIOS2_VERSION_MINOR * 100000000 + \
5193-
ADIOS2_VERSION_PATCH * 1000000 + ADIOS2_VERSION_TWEAK >= \
5194-
2701001223
5188+
#if openPMD_HAVE_ADIOS2 && defined(ADIOS2_HAVE_BP5)
51955189
void adios2_bp5_no_steps(bool usesteps)
51965190
{
51975191
std::string const config = R"END(

0 commit comments

Comments
 (0)