fixup! operators: fix module library

ornladios · Aug 16, 2023 · bf2f330 · bf2f330
1 parent 12e85cc
commit bf2f330
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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();
 }