ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use _EXECUTABLE consistently instead of _BINARY

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-05-23 11:14:17 -04:00
parent 9f7833668a
commit b461a49eee
12 changed files with 89 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
unittest/formats/CMakeLists.txt
View File

@ -64,39 +64,39 @@ if(PKG_COMPRESS AND GZIP_FOUND)
target_link_libraries(test_dump_xyz_compressed PRIVATE lammps GTest::GMock)
add_test(NAME DumpAtomGZ COMMAND test_dump_atom_compressed gz)
set_tests_properties(DumpAtomGZ PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_BINARY=${GZIP_EXECUTABLE}")
set_tests_properties(DumpAtomGZ PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_EXECUTABLE=${GZIP_EXECUTABLE}")
add_test(NAME DumpCustomGZ COMMAND test_dump_custom_compressed gz)
set_tests_properties(DumpCustomGZ PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_BINARY=${GZIP_EXECUTABLE}")
set_tests_properties(DumpCustomGZ PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_EXECUTABLE=${GZIP_EXECUTABLE}")
add_test(NAME DumpCfgGZ COMMAND test_dump_cfg_compressed gz)
set_tests_properties(DumpCfgGZ PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_BINARY=${GZIP_EXECUTABLE}")
set_tests_properties(DumpCfgGZ PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_EXECUTABLE=${GZIP_EXECUTABLE}")
add_test(NAME DumpLocalGZ COMMAND test_dump_local_compressed gz)
set_tests_properties(DumpLocalGZ PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_BINARY=${GZIP_EXECUTABLE}")
set_tests_properties(DumpLocalGZ PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_EXECUTABLE=${GZIP_EXECUTABLE}")
add_test(NAME DumpXYZGZ COMMAND test_dump_xyz_compressed gz)
set_tests_properties(DumpXYZGZ PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_BINARY=${GZIP_EXECUTABLE}")
set_tests_properties(DumpXYZGZ PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_EXECUTABLE=${GZIP_EXECUTABLE}")
find_package(PkgConfig REQUIRED)
find_package(PkgConfig)
pkg_check_modules(Zstd IMPORTED_TARGET libzstd>=1.4)
find_program(ZSTD_BINARY NAMES zstd)
find_program(ZSTD_EXECUTABLE NAMES zstd)
if(Zstd_FOUND AND ZSTD_BINARY)
if(Zstd_FOUND AND ZSTD_EXECUTABLE)
add_test(NAME DumpAtomZstd COMMAND test_dump_atom_compressed zstd)
set_tests_properties(DumpAtomZstd PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_BINARY=${ZSTD_BINARY}")
set_tests_properties(DumpAtomZstd PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_EXECUTABLE=${ZSTD_EXECUTABLE}")
add_test(NAME DumpCustomZstd COMMAND test_dump_custom_compressed zstd)
set_tests_properties(DumpCustomZstd PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_BINARY=${ZSTD_BINARY}")
set_tests_properties(DumpCustomZstd PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_EXECUTABLE=${ZSTD_EXECUTABLE}")
add_test(NAME DumpCfgZstd COMMAND test_dump_cfg_compressed zstd)
set_tests_properties(DumpCfgZstd PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_BINARY=${ZSTD_BINARY}")
set_tests_properties(DumpCfgZstd PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_EXECUTABLE=${ZSTD_EXECUTABLE}")
add_test(NAME DumpLocalZstd COMMAND test_dump_local_compressed zstd)
set_tests_properties(DumpLocalZstd PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_BINARY=${ZSTD_BINARY}")
set_tests_properties(DumpLocalZstd PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_EXECUTABLE=${ZSTD_EXECUTABLE}")
add_test(NAME DumpXYZZstd COMMAND test_dump_xyz_compressed zstd)
set_tests_properties(DumpXYZZstd PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_BINARY=${ZSTD_BINARY}")
set_tests_properties(DumpXYZZstd PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};COMPRESS_EXECUTABLE=${ZSTD_EXECUTABLE}")
endif()
endif()
@ -121,11 +121,11 @@ if(PKG_NETCDF)
target_link_libraries(test_dump_netcdf PRIVATE lammps GTest::GMock)
add_test(NAME DumpNetCDF COMMAND test_dump_netcdf)
if(NOT (NCDUMP STREQUAL "NCDUMP-NOTFOUND"))
set_tests_properties(DumpNetCDF PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};NCDUMP_BINARY=${NCDUMP}")
set_tests_properties(DumpNetCDF PROPERTIES ENVIRONMENT "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS_DIR};NCDUMP_EXECUTABLE=${NCDUMP}")
endif()
endif()
if(BUILD_TOOLS)
set_tests_properties(DumpAtom PROPERTIES ENVIRONMENT "BINARY2TXT_BINARY=$<TARGET_FILE:binary2txt>")
set_tests_properties(DumpCustom PROPERTIES ENVIRONMENT "BINARY2TXT_BINARY=$<TARGET_FILE:binary2txt>")
set_tests_properties(DumpAtom PROPERTIES ENVIRONMENT "BINARY2TXT_EXECUTABLE=$<TARGET_FILE:binary2txt>")
set_tests_properties(DumpCustom PROPERTIES ENVIRONMENT "BINARY2TXT_EXECUTABLE=$<TARGET_FILE:binary2txt>")
endif()

4
unittest/formats/compressed_dump_test_main.cpp
View File

@ -22,7 +22,7 @@
const char *COMPRESS_SUFFIX = nullptr;
const char *COMPRESS_EXTENSION = nullptr;
char *COMPRESS_BINARY = nullptr;
char *COMPRESS_EXECUTABLE = nullptr;
bool verbose = false;
int main(int argc, char **argv)
@ -46,7 +46,7 @@ int main(int argc, char **argv)
return 1;
}
COMPRESS_BINARY = getenv("COMPRESS_BINARY");
COMPRESS_EXECUTABLE = getenv("COMPRESS_EXECUTABLE");
// handle arguments passed via environment variable
if (const char *var = getenv("TEST_ARGS")) {

5
unittest/formats/test_atom_styles.cpp
View File

@ -2123,7 +2123,7 @@ TEST_F(AtomStyleTest, body_nparticle)
"12.0 0.0 12.0 0.0 0.0 0.0\n"
"0.0 1.0 0.0\n"
"0.0 -3.0 0.0\n";
FILE *fp = fopen("input_atom_styles.data", "w");
FILE *fp = fopen("input_atom_styles.data", "w");
fputs(data_file, fp);
fclose(fp);
BEGIN_HIDE_OUTPUT();
@ -5159,7 +5159,7 @@ TEST_F(AtomStyleTest, oxdna)
EXPECT_NEAR(bonus[9].shape[1], 0.5869922515711705, EPSILON);
EXPECT_NEAR(bonus[9].shape[2], 0.5869922515711705, EPSILON);
EXPECT_NEAR(bonus[0].quat[0], 0.9890278201757743, EPSILON);
EXPECT_NEAR(bonus[0].quat[0], 0.9890278201757743, EPSILON);
EXPECT_NEAR(bonus[0].quat[1], 0.01779228232037064, EPSILON);
EXPECT_NEAR(bonus[0].quat[2], -0.14337734159225404, EPSILON);
EXPECT_NEAR(bonus[0].quat[3], 0.030827642240801516, EPSILON);
@ -5246,7 +5246,6 @@ TEST_F(AtomStyleTest, oxdna)
ASSERT_EQ(id5p[GETIDX(10)], -1);
END_HIDE_OUTPUT();
}
} // namespace LAMMPS_NS

24
unittest/formats/test_dump_atom.cpp
View File

@ -25,8 +25,8 @@
using ::testing::Eq;
char *BINARY2TXT_BINARY = nullptr;
bool verbose = false;
char *BINARY2TXT_EXECUTABLE = nullptr;
bool verbose = false;
class DumpAtomTest : public MeltTest {
std::string dump_style = "atom";
@ -100,7 +100,7 @@ public:
std::string convert_binary_to_text(std::string binary_file)
{
BEGIN_HIDE_OUTPUT();
std::string cmdline = fmt::format("{} {}", BINARY2TXT_BINARY, binary_file);
std::string cmdline = fmt::format("{} {}", BINARY2TXT_EXECUTABLE, binary_file);
system(cmdline.c_str());
END_HIDE_OUTPUT();
return fmt::format("{}.txt", binary_file);
@ -328,7 +328,7 @@ TEST_F(DumpAtomTest, triclinic_with_image_run0)
TEST_F(DumpAtomTest, binary_run0)
{
if (!BINARY2TXT_BINARY) GTEST_SKIP();
if (!BINARY2TXT_EXECUTABLE) GTEST_SKIP();
auto text_file = text_dump_filename("run0");
auto binary_file = binary_dump_filename("run0");
@ -349,7 +349,7 @@ TEST_F(DumpAtomTest, binary_run0)
TEST_F(DumpAtomTest, binary_with_units_run0)
{
if (!BINARY2TXT_BINARY) GTEST_SKIP();
if (!BINARY2TXT_EXECUTABLE) GTEST_SKIP();
auto text_file = text_dump_filename("with_units_run0");
auto binary_file = binary_dump_filename("with_units_run0");
@ -370,7 +370,7 @@ TEST_F(DumpAtomTest, binary_with_units_run0)
TEST_F(DumpAtomTest, binary_with_time_run0)
{
if (!BINARY2TXT_BINARY) GTEST_SKIP();
if (!BINARY2TXT_EXECUTABLE) GTEST_SKIP();
auto text_file = text_dump_filename("with_time_run0");
auto binary_file = binary_dump_filename("with_time_run0");
@ -391,7 +391,7 @@ TEST_F(DumpAtomTest, binary_with_time_run0)
TEST_F(DumpAtomTest, binary_triclinic_run0)
{
if (!BINARY2TXT_BINARY) GTEST_SKIP();
if (!BINARY2TXT_EXECUTABLE) GTEST_SKIP();
auto text_file = text_dump_filename("tri_run0");
auto binary_file = binary_dump_filename("tri_run0");
@ -413,7 +413,7 @@ TEST_F(DumpAtomTest, binary_triclinic_run0)
TEST_F(DumpAtomTest, binary_triclinic_with_units_run0)
{
if (!BINARY2TXT_BINARY) GTEST_SKIP();
if (!BINARY2TXT_EXECUTABLE) GTEST_SKIP();
auto text_file = text_dump_filename("tri_with_units_run0");
auto binary_file = binary_dump_filename("tri_with_units_run0");
@ -435,7 +435,7 @@ TEST_F(DumpAtomTest, binary_triclinic_with_units_run0)
TEST_F(DumpAtomTest, binary_triclinic_with_time_run0)
{
if (!BINARY2TXT_BINARY) GTEST_SKIP();
if (!BINARY2TXT_EXECUTABLE) GTEST_SKIP();
auto text_file = text_dump_filename("tri_with_time_run0");
auto binary_file = binary_dump_filename("tri_with_time_run0");
@ -457,7 +457,7 @@ TEST_F(DumpAtomTest, binary_triclinic_with_time_run0)
TEST_F(DumpAtomTest, binary_triclinic_with_image_run0)
{
if (!BINARY2TXT_BINARY) GTEST_SKIP();
if (!BINARY2TXT_EXECUTABLE) GTEST_SKIP();
auto text_file = text_dump_filename("tri_with_image_run0");
auto binary_file = binary_dump_filename("tri_with_image_run0");
@ -649,7 +649,7 @@ TEST_F(DumpAtomTest, write_dump)
TEST_F(DumpAtomTest, binary_write_dump)
{
if (!BINARY2TXT_BINARY) GTEST_SKIP();
if (!BINARY2TXT_EXECUTABLE) GTEST_SKIP();
auto reference = binary_dump_filename("write_run0_ref");
auto dump_file = fmt::format("write_{}", binary_dump_filename("write_dump_atom_run*_p%"));
@ -693,7 +693,7 @@ int main(int argc, char **argv)
}
}
BINARY2TXT_BINARY = getenv("BINARY2TXT_BINARY");
BINARY2TXT_EXECUTABLE = getenv("BINARY2TXT_EXECUTABLE");
if ((argc > 1) && (strcmp(argv[1], "-v") == 0)) verbose = true;

24
unittest/formats/test_dump_atom_compressed.cpp
View File

@ -33,7 +33,7 @@ public:
TEST_F(DumpAtomCompressTest, compressed_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto text_file = text_dump_filename("run0.melt");
auto compressed_file = compressed_dump_filename("run0.melt");
@ -62,7 +62,7 @@ TEST_F(DumpAtomCompressTest, compressed_run0)
TEST_F(DumpAtomCompressTest, compressed_no_buffer_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto text_file = text_dump_filename("no_buffer_run0.melt");
auto compressed_file = compressed_dump_filename("no_buffer_run0.melt");
@ -91,7 +91,7 @@ TEST_F(DumpAtomCompressTest, compressed_no_buffer_run0)
TEST_F(DumpAtomCompressTest, compressed_multi_file_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_run1_*.melt";
auto base_name_0 = "multi_file_run1_0.melt";
@ -131,7 +131,7 @@ TEST_F(DumpAtomCompressTest, compressed_multi_file_run1)
TEST_F(DumpAtomCompressTest, compressed_multi_file_with_pad_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_pad_run1_*.melt";
auto base_name_0 = "multi_file_pad_run1_000.melt";
@ -172,7 +172,7 @@ TEST_F(DumpAtomCompressTest, compressed_multi_file_with_pad_run1)
TEST_F(DumpAtomCompressTest, compressed_multi_file_with_maxfiles_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_maxfiles_run1_*.melt";
auto base_name_0 = "multi_file_maxfiles_run1_0.melt";
@ -218,7 +218,7 @@ TEST_F(DumpAtomCompressTest, compressed_multi_file_with_maxfiles_run1)
TEST_F(DumpAtomCompressTest, compressed_with_units_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "with_units_run0.melt";
auto text_file = text_dump_filename(base_name);
@ -242,7 +242,7 @@ TEST_F(DumpAtomCompressTest, compressed_with_units_run0)
TEST_F(DumpAtomCompressTest, compressed_with_time_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "with_time_run0.melt";
auto text_file = text_dump_filename(base_name);
@ -266,7 +266,7 @@ TEST_F(DumpAtomCompressTest, compressed_with_time_run0)
TEST_F(DumpAtomCompressTest, compressed_triclinic_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "tri_run0.melt";
auto text_file = text_dump_filename(base_name);
@ -291,7 +291,7 @@ TEST_F(DumpAtomCompressTest, compressed_triclinic_run0)
TEST_F(DumpAtomCompressTest, compressed_triclinic_with_units_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "tri_with_units_run0.melt";
auto text_file = text_dump_filename(base_name);
@ -316,7 +316,7 @@ TEST_F(DumpAtomCompressTest, compressed_triclinic_with_units_run0)
TEST_F(DumpAtomCompressTest, compressed_triclinic_with_time_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "tri_with_time_run0.melt";
auto text_file = text_dump_filename(base_name);
@ -341,7 +341,7 @@ TEST_F(DumpAtomCompressTest, compressed_triclinic_with_time_run0)
TEST_F(DumpAtomCompressTest, compressed_triclinic_with_image_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "tri_with_image_run0.melt";
auto text_file = text_dump_filename(base_name);
@ -394,7 +394,7 @@ TEST_F(DumpAtomCompressTest, compressed_modify_multi_bad_param)
TEST_F(DumpAtomCompressTest, compressed_modify_clevel_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "modify_clevel_run0.melt";
auto text_file = text_dump_filename(base_name);

14
unittest/formats/test_dump_cfg_compressed.cpp
View File

@ -33,7 +33,7 @@ public:
TEST_F(DumpCfgCompressTest, compressed_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "run*.melt.cfg";
auto text_files = text_dump_filename(base_name);
@ -67,7 +67,7 @@ TEST_F(DumpCfgCompressTest, compressed_run0)
TEST_F(DumpCfgCompressTest, compressed_no_buffer_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "no_buffer_run*.melt.cfg";
auto text_files = text_dump_filename(base_name);
@ -101,7 +101,7 @@ TEST_F(DumpCfgCompressTest, compressed_no_buffer_run0)
TEST_F(DumpCfgCompressTest, compressed_unwrap_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "unwrap_run*.melt.cfg";
auto text_files = text_dump_filename(base_name);
@ -130,7 +130,7 @@ TEST_F(DumpCfgCompressTest, compressed_unwrap_run0)
TEST_F(DumpCfgCompressTest, compressed_multi_file_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_run1_*.melt.cfg";
auto base_name_0 = "multi_file_run1_0.melt.cfg";
@ -172,7 +172,7 @@ TEST_F(DumpCfgCompressTest, compressed_multi_file_run1)
TEST_F(DumpCfgCompressTest, compressed_multi_file_with_pad_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_pad_run1_*.melt.cfg";
auto base_name_0 = "multi_file_pad_run1_000.melt.cfg";
@ -214,7 +214,7 @@ TEST_F(DumpCfgCompressTest, compressed_multi_file_with_pad_run1)
TEST_F(DumpCfgCompressTest, compressed_multi_file_with_maxfiles_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_maxfiles_run1_*.melt.cfg";
auto base_name_0 = "multi_file_maxfiles_run1_0.melt.cfg";
@ -292,7 +292,7 @@ TEST_F(DumpCfgCompressTest, compressed_modify_multi_bad_param)
TEST_F(DumpCfgCompressTest, compressed_modify_clevel_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "modify_clevel_run*.melt.cfg";
auto base_name_0 = "modify_clevel_run0.melt.cfg";

12
unittest/formats/test_dump_custom.cpp
View File

@ -23,8 +23,8 @@
using ::testing::Eq;
char *BINARY2TXT_BINARY = nullptr;
bool verbose = false;
char *BINARY2TXT_EXECUTABLE = nullptr;
bool verbose = false;
class DumpCustomTest : public MeltTest {
std::string dump_style = "custom";
@ -100,7 +100,7 @@ public:
std::string convert_binary_to_text(std::string binary_file)
{
BEGIN_HIDE_OUTPUT();
std::string cmdline = fmt::format("{} {}", BINARY2TXT_BINARY, binary_file);
std::string cmdline = fmt::format("{} {}", BINARY2TXT_EXECUTABLE, binary_file);
system(cmdline.c_str());
END_HIDE_OUTPUT();
return fmt::format("{}.txt", binary_file);
@ -210,7 +210,7 @@ TEST_F(DumpCustomTest, custom_run0)
TEST_F(DumpCustomTest, binary_run1)
{
if (!BINARY2TXT_BINARY) GTEST_SKIP();
if (!BINARY2TXT_EXECUTABLE) GTEST_SKIP();
auto text_file = text_dump_filename("run1");
auto binary_file = binary_dump_filename("run1");
@ -251,7 +251,7 @@ TEST_F(DumpCustomTest, triclinic_run1)
TEST_F(DumpCustomTest, binary_triclinic_run1)
{
if (!BINARY2TXT_BINARY) GTEST_SKIP();
if (!BINARY2TXT_EXECUTABLE) GTEST_SKIP();
auto text_file = text_dump_filename("tri_run1");
auto binary_file = binary_dump_filename("tri_run1");
@ -399,7 +399,7 @@ int main(int argc, char **argv)
}
}
BINARY2TXT_BINARY = getenv("BINARY2TXT_BINARY");
BINARY2TXT_EXECUTABLE = getenv("BINARY2TXT_EXECUTABLE");
if ((argc > 1) && (strcmp(argv[1], "-v") == 0)) verbose = true;

16
unittest/formats/test_dump_custom_compressed.cpp
View File

@ -29,7 +29,7 @@ public:
TEST_F(DumpCustomCompressTest, compressed_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "custom_run1.melt";
auto text_file = text_dump_filename(base_name);
@ -59,7 +59,7 @@ TEST_F(DumpCustomCompressTest, compressed_run1)
TEST_F(DumpCustomCompressTest, compressed_with_time_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "with_time_custom_run1.melt";
auto text_file = text_dump_filename(base_name);
@ -89,7 +89,7 @@ TEST_F(DumpCustomCompressTest, compressed_with_time_run1)
TEST_F(DumpCustomCompressTest, compressed_no_buffer_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "no_buffer_custom_run1.melt";
auto text_file = text_dump_filename(base_name);
@ -119,7 +119,7 @@ TEST_F(DumpCustomCompressTest, compressed_no_buffer_run1)
TEST_F(DumpCustomCompressTest, compressed_triclinic_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "custom_tri_run1.melt";
auto text_file = text_dump_filename(base_name);
@ -146,7 +146,7 @@ TEST_F(DumpCustomCompressTest, compressed_triclinic_run1)
TEST_F(DumpCustomCompressTest, compressed_multi_file_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_run1_*.melt.custom";
auto base_name_0 = "multi_file_run1_0.melt.custom";
@ -188,7 +188,7 @@ TEST_F(DumpCustomCompressTest, compressed_multi_file_run1)
TEST_F(DumpCustomCompressTest, compressed_multi_file_with_pad_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_pad_run1_*.melt.custom";
auto base_name_0 = "multi_file_pad_run1_000.melt.custom";
@ -230,7 +230,7 @@ TEST_F(DumpCustomCompressTest, compressed_multi_file_with_pad_run1)
TEST_F(DumpCustomCompressTest, compressed_multi_file_with_maxfiles_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_maxfiles_run1_*.melt.custom";
auto base_name_0 = "multi_file_maxfiles_run1_0.melt.custom";
@ -304,7 +304,7 @@ TEST_F(DumpCustomCompressTest, compressed_modify_multi_bad_param)
TEST_F(DumpCustomCompressTest, compressed_modify_clevel_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "modify_clevel_run0.melt.custom";
auto text_file = text_dump_filename(base_name);

6
unittest/formats/test_dump_local.cpp
View File

@ -25,8 +25,8 @@
using ::testing::Eq;
char *BINARY2TXT_BINARY = nullptr;
bool verbose = false;
char *BINARY2TXT_EXECUTABLE = nullptr;
bool verbose = false;
class DumpLocalTest : public MeltTest {
std::string dump_style = "local";
@ -253,7 +253,7 @@ int main(int argc, char **argv)
}
}
BINARY2TXT_BINARY = getenv("BINARY2TXT_BINARY");
BINARY2TXT_EXECUTABLE = getenv("BINARY2TXT_EXECUTABLE");
if ((argc > 1) && (strcmp(argv[1], "-v") == 0)) verbose = true;

18
unittest/formats/test_dump_local_compressed.cpp
View File

@ -38,7 +38,7 @@ public:
TEST_F(DumpLocalCompressTest, compressed_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "run*.melt.local";
auto base_name_0 = "run0.melt.local";
@ -71,7 +71,7 @@ TEST_F(DumpLocalCompressTest, compressed_run0)
TEST_F(DumpLocalCompressTest, compressed_no_buffer_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "no_buffer_run*.melt.local";
auto base_name_0 = "no_buffer_run0.melt.local";
@ -104,7 +104,7 @@ TEST_F(DumpLocalCompressTest, compressed_no_buffer_run0)
TEST_F(DumpLocalCompressTest, compressed_with_time_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "with_time_run*.melt.local";
auto base_name_0 = "with_time_run0.melt.local";
@ -137,7 +137,7 @@ TEST_F(DumpLocalCompressTest, compressed_with_time_run0)
TEST_F(DumpLocalCompressTest, compressed_with_units_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "with_units_run*.melt.local";
auto base_name_0 = "with_units_run0.melt.local";
@ -170,7 +170,7 @@ TEST_F(DumpLocalCompressTest, compressed_with_units_run0)
TEST_F(DumpLocalCompressTest, compressed_triclinic_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
enable_triclinic();
auto base_name = "triclinic_run*.melt.local";
@ -204,7 +204,7 @@ TEST_F(DumpLocalCompressTest, compressed_triclinic_run0)
TEST_F(DumpLocalCompressTest, compressed_multi_file_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_run1_*.melt.local";
auto base_name_0 = "multi_file_run1_0.melt.local";
@ -246,7 +246,7 @@ TEST_F(DumpLocalCompressTest, compressed_multi_file_run1)
TEST_F(DumpLocalCompressTest, compressed_multi_file_with_pad_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_pad_run1_*.melt.local";
auto base_name_0 = "multi_file_pad_run1_000.melt.local";
@ -288,7 +288,7 @@ TEST_F(DumpLocalCompressTest, compressed_multi_file_with_pad_run1)
TEST_F(DumpLocalCompressTest, compressed_multi_file_with_maxfiles_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_maxfiles_run1_*.melt.local";
auto base_name_0 = "multi_file_maxfiles_run1_0.melt.local";
@ -368,7 +368,7 @@ TEST_F(DumpLocalCompressTest, compressed_modify_multi_bad_param)
TEST_F(DumpLocalCompressTest, compressed_modify_clevel_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "modify_clevel_run0.melt.local";
auto text_file = text_dump_filename(base_name);

12
unittest/formats/test_dump_netcdf.cpp
View File

@ -28,8 +28,8 @@
using ::testing::Eq;
char *NCDUMP_BINARY = nullptr;
bool verbose = false;
char *NCDUMP_EXECUTABLE = nullptr;
bool verbose = false;
class DumpNetCDFTest : public MeltTest {
std::string dump_style = "netcdf";
@ -80,7 +80,7 @@ public:
std::string convert_binary_to_text(std::string binary_file)
{
BEGIN_HIDE_OUTPUT();
std::string cmdline = fmt::format("{0} {1} > {1}.txt", NCDUMP_BINARY, binary_file);
std::string cmdline = fmt::format("{0} {1} > {1}.txt", NCDUMP_EXECUTABLE, binary_file);
system(cmdline.c_str());
END_HIDE_OUTPUT();
return fmt::format("{}.txt", binary_file);
@ -96,7 +96,7 @@ TEST_F(DumpNetCDFTest, run0_plain)
generate_dump(dump_file, fields, "", 0);
ASSERT_FILE_EXISTS(dump_file);
if (NCDUMP_BINARY) {
if (NCDUMP_EXECUTABLE) {
auto converted_file = convert_binary_to_text(dump_file);
auto lines = read_lines(converted_file);
auto header = utils::split_words(lines[0]);
@ -246,7 +246,7 @@ TEST_F(DumpNetCDFTest, run0_mpi)
generate_dump(dump_file, fields, "", 0);
ASSERT_FILE_EXISTS(dump_file);
if (NCDUMP_BINARY) {
if (NCDUMP_EXECUTABLE) {
auto converted_file = convert_binary_to_text(dump_file);
auto lines = read_lines(converted_file);
auto header = utils::split_words(lines[0]);
@ -402,7 +402,7 @@ int main(int argc, char **argv)
}
}
NCDUMP_BINARY = getenv("NCDUMP_BINARY");
NCDUMP_EXECUTABLE = getenv("NCDUMP_EXECUTABLE");
if ((argc > 1) && (strcmp(argv[1], "-v") == 0)) verbose = true;

12
unittest/formats/test_dump_xyz_compressed.cpp
View File

@ -29,7 +29,7 @@ public:
TEST_F(DumpXYZCompressTest, compressed_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "run*.melt.xyz";
auto base_name_0 = "run0.melt.xyz";
@ -61,7 +61,7 @@ TEST_F(DumpXYZCompressTest, compressed_run0)
TEST_F(DumpXYZCompressTest, compressed_no_buffer_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "no_buffer_run*.melt.xyz";
auto base_name_0 = "no_buffer_run0.melt.xyz";
@ -93,7 +93,7 @@ TEST_F(DumpXYZCompressTest, compressed_no_buffer_run0)
TEST_F(DumpXYZCompressTest, compressed_multi_file_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_run1_*.melt.xyz";
auto base_name_0 = "multi_file_run1_0.melt.xyz";
@ -133,7 +133,7 @@ TEST_F(DumpXYZCompressTest, compressed_multi_file_run1)
TEST_F(DumpXYZCompressTest, compressed_multi_file_with_pad_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_pad_run1_*.melt.xyz";
auto base_name_0 = "multi_file_pad_run1_000.melt.xyz";
@ -174,7 +174,7 @@ TEST_F(DumpXYZCompressTest, compressed_multi_file_with_pad_run1)
TEST_F(DumpXYZCompressTest, compressed_multi_file_with_maxfiles_run1)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "multi_file_maxfiles_run1_*.melt.xyz";
auto base_name_0 = "multi_file_maxfiles_run1_0.melt.xyz";
@ -248,7 +248,7 @@ TEST_F(DumpXYZCompressTest, compressed_modify_multi_bad_param)
TEST_F(DumpXYZCompressTest, compressed_modify_clevel_run0)
{
if (!COMPRESS_BINARY) GTEST_SKIP();
if (!COMPRESS_EXECUTABLE) GTEST_SKIP();
auto base_name = "modify_clevel_run0.melt.xyz";
auto text_file = text_dump_filename(base_name);