Unverified Commit 46e0c8b6 authored by Richard Berger's avatar Richard Berger
Browse files

Remove duplicated read_yaml_file function

parent 73e766b9
Loading
Loading
Loading
Loading
+0 −12
Original line number Diff line number Diff line
@@ -193,18 +193,6 @@ void data_lammps(LAMMPS_NS::LAMMPS *lmp, const TestConfig &cfg)
}


// read/parse yaml file

bool read_yaml_file(const char *infile, TestConfig &config)
{
    auto reader = TestConfigReader(config);
    if (reader.parse_file(infile))
        return false;
    
    config.basename = reader.get_basename();
    return true;
}

// re-generate yaml file with current settings.

void generate_yaml_file(const char *outfile, const TestConfig &config)
+0 −12
Original line number Diff line number Diff line
@@ -194,18 +194,6 @@ void data_lammps(LAMMPS_NS::LAMMPS *lmp, const TestConfig &cfg)
    lmp->input->one("run 0 post no");
}

// read/parse yaml file

bool read_yaml_file(const char *infile, TestConfig &config)
{
    auto reader = TestConfigReader(config);
    if (reader.parse_file(infile))
        return false;
    
    config.basename = reader.get_basename();
    return true;
}

// re-generate yaml file with current settings.

void generate_yaml_file(const char *outfile, const TestConfig &config)
+0 −9
Original line number Diff line number Diff line
@@ -194,15 +194,6 @@ void data_lammps(LAMMPS_NS::LAMMPS *lmp, const TestConfig &cfg)

// read/parse yaml file

bool read_yaml_file(const char *infile, TestConfig &config)
{
    auto reader = TestConfigReader(config);
    if (reader.parse_file(infile))
        return false;
    
    config.basename = reader.get_basename();
    return true;
}

// re-generate yaml file with current settings.

+12 −1
Original line number Diff line number Diff line
@@ -13,14 +13,25 @@

#include "test_main.h"
#include "test_config.h"
#include "test_config_reader.h"
#include "gtest/gtest.h"

#include <mpi.h>
#include <cstring>
#include <iostream>

// common read_yaml_file function
bool read_yaml_file(const char *infile, TestConfig &config)
{
    auto reader = TestConfigReader(config);
    if (reader.parse_file(infile))
        return false;
    
    config.basename = reader.get_basename();
    return true;
}

// need to be defined in unit test body
extern bool read_yaml_file(const char *, TestConfig &);
extern void generate_yaml_file(const char *, const TestConfig &);

void usage(std::ostream &out, const char *name)