Commit af153cc0 authored by Doak, Peter W.'s avatar Doak, Peter W.
Browse files

missing ifdef for adios2

parent 47108306

test/unit/io/reader_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "dca/io/json/json_reader.hpp"

#ifdef DCA_HAVE_ADIOS2

#include "dca/io/adios2/adios2_reader.hpp"

adios2::ADIOS* adios_ptr;

#endif

#include <vector>

#include "gtest/gtest.h"
@@ -35,7 +36,6 @@ using ReaderTypes = ::testing::Types<dca::io::CSVReader, dca::io::HDF5Reader, dc 


TYPED_TEST_CASE(ReaderTest, ReaderTypes);



adios2::ADIOS* adios_ptr;

dca::parallel::NoConcurrency* concurrency_ptr;



TEST(JSONReaderTest, Vector) {

test/unit/io/writer_test.cpp

+6 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "dca/io/adios2/adios2_writer.hpp"

adios2::ADIOS* adios_ptr;

#endif

#include "dca/parallel/no_concurrency/no_concurrency.hpp"

dca::parallel::NoConcurrency* concurrency_ptr;



template <typename T>
@@ -32,26 +33,29 @@ using Concurrency = dca::parallel::NoConcurrency; 


using WriterTypes = ::testing::Types<dca::io::HDF5Writer, dca::io::JSONWriter

#ifdef DCA_HAVE_ADIOS2

                                     ,

                                     dca::io::ADIOS2Writer<Concurrency>

                                     ,dca::io::ADIOS2Writer<Concurrency>

#endif

                                     >;  //, dca::io::CSVWriter>;

TYPED_TEST_CASE(WriterTest, WriterTypes);



TYPED_TEST(WriterTest, Constructor) {

  std::unique_ptr<TypeParam> writer_ptr;

#ifdef DCA_HAVE_ADIOS2

  if constexpr (std::is_same<TypeParam, dca::io::ADIOS2Writer<Concurrency>>::value)

    writer_ptr = std::make_unique<TypeParam>(*adios_ptr, concurrency_ptr);

  else

#endif

    writer_ptr = std::make_unique<TypeParam>();

  dca::util::ignoreUnused(writer_ptr);

}



TYPED_TEST(WriterTest, Unique_Ptr) {

  std::unique_ptr<TypeParam> writer_ptr;

#ifdef DCA_HAVE_ADIOS2

  if constexpr (std::is_same<TypeParam, dca::io::ADIOS2Writer<Concurrency>>::value)

    writer_ptr = std::make_unique<TypeParam>(*adios_ptr, concurrency_ptr);

  else

#endif

    writer_ptr = std::make_unique<TypeParam>();



        TypeParam& writer = *writer_ptr;