From bf2f3301becc5d8fa7f699e9249009b8a6df2590 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Wed, 16 Aug 2023 11:24:47 -0400 Subject: [PATCH] fixup! operators: fix module library --- CTestCustom.cmake.in | 1 + testing/adios2/bindings/C/TestBPWriteTypes.cpp | 6 ++++++ testing/adios2/interface/TestADIOSInterface.cpp | 13 ++++++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in index e118eb3e31..8356e4f57f 100644 --- a/CTestCustom.cmake.in +++ b/CTestCustom.cmake.in @@ -24,6 +24,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION "Warning #20208-D: '.*' is treated as '.*' in device code" "Warning: '.*' is treated as '.*' in device code" ".*was specified as both a system and non-system include directory.*" + "Wunused-command-line-argument" ) list(APPEND CTEST_CUSTOM_COVERAGE_EXCLUDE ".*/thirdparty/.*" diff --git a/testing/adios2/bindings/C/TestBPWriteTypes.cpp b/testing/adios2/bindings/C/TestBPWriteTypes.cpp index 94b1214b51..2fb0f9c118 100644 --- a/testing/adios2/bindings/C/TestBPWriteTypes.cpp +++ b/testing/adios2/bindings/C/TestBPWriteTypes.cpp @@ -176,7 +176,11 @@ TEST_F(ADIOS2_C_API, ADIOS2BPWriteTypes) char *engineType = new char[engineTypeSize + 1](); adios2_engine_get_type(engineType, &engineTypeSize, engineH); +#ifdef ADIOS2_HAVE_BP5 EXPECT_EQ(std::string(engineType, engineTypeSize), "BP5Writer"); +#else + EXPECT_EQ(std::string(engineType, engineTypeSize), "BP4Writer"); +#endif adios2_close(engineH); @@ -196,7 +200,9 @@ TEST_F(ADIOS2_C_API, ADIOS2BPWriteTypes) adios2_mode m; adios2_error e = adios2_engine_openmode(&m, engineH); EXPECT_EQ(e, adios2_error_none); +#ifdef ADIOS2_HAVE_BP5 EXPECT_EQ(m, adios2_mode_readRandomAccess); +#endif adios2_bool result; char name[30]; diff --git a/testing/adios2/interface/TestADIOSInterface.cpp b/testing/adios2/interface/TestADIOSInterface.cpp index a7f628c76f..ac4411ed9e 100644 --- a/testing/adios2/interface/TestADIOSInterface.cpp +++ b/testing/adios2/interface/TestADIOSInterface.cpp @@ -122,7 +122,11 @@ TEST_F(ADIOS2_CXX11_API, APIToString) auto engine = io.Open("test.bp", adios2::Mode::Write); +#ifdef ADIOS2_HAVE_BP5 EXPECT_EQ(ToString(engine), "Engine(Name: \"test.bp\", Type: \"BP5Writer\")"); +#else + EXPECT_EQ(ToString(engine), "Engine(Name: \"test.bp\", Type: \"BP4Writer\")"); +#endif } TEST_F(ADIOS2_CXX11_API, operatorLL) @@ -149,8 +153,11 @@ TEST_F(ADIOS2_CXX11_API_IO, Engine) adios2::Engine engine = m_Io.Open("types.bp", adios2::Mode::Write); EXPECT_EQ(engine.Name(), "types.bp"); +#ifdef ADIOS2_HAVE_BP5 EXPECT_EQ(engine.Type(), "BP5Writer"); - +#else + EXPECT_EQ(engine.Type(), "BP4Writer"); +#endif engine.Close(); } @@ -161,7 +168,11 @@ TEST_F(ADIOS2_CXX11_API_IO, EngineDefault) adios2::Engine engine = m_Io.Open("types.bp", adios2::Mode::Write); EXPECT_EQ(engine.Name(), "types.bp"); +#ifdef ADIOS2_HAVE_BP5 EXPECT_EQ(engine.Type(), "BP5Writer"); +#else + EXPECT_EQ(engine.Type(), "BP4Writer"); +#endif engine.Close(); }