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

move definition of the INPUT_FOLDER variable from header to implementation file

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-05-20 15:22:43 -04:00
parent 2536076ce9
commit 917b7dd4fa
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
unittest/force-styles/test_main.cpp
View File

@ -55,6 +55,11 @@ bool print_stats = false;
// whether to print verbose output (i.e. not capturing LAMMPS screen output). // whether to print verbose output (i.e. not capturing LAMMPS screen output).
bool verbose = false; bool verbose = false;
// location for 'in.*' and 'data.*' files required by tests
#define STRINGIFY(val) XSTR(val)
#define XSTR(val) #val
std::string INPUT_FOLDER = STRINGIFY(TEST_INPUT_FOLDER);
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
MPI_Init(&argc, &argv); MPI_Init(&argc, &argv);

7
unittest/force-styles/test_main.h
View File

@ -20,6 +20,7 @@
extern TestConfig test_config; extern TestConfig test_config;
extern bool print_stats; extern bool print_stats;
extern bool verbose; extern bool verbose;
extern std::string INPUT_FOLDER;
#define EXPECT_FP_LE_WITH_EPS(val1,val2,eps) \ #define EXPECT_FP_LE_WITH_EPS(val1,val2,eps) \
do { \ do { \
@ -32,12 +33,6 @@ extern bool verbose;
#endif #endif
#define STRINGIFY(val) XSTR(val)
#define XSTR(val) #val
static const std::string INPUT_FOLDER = STRINGIFY(TEST_INPUT_FOLDER);
#undef STRINGIFY
#undef XSTR
#if defined _WIN32 #if defined _WIN32
static const char PATH_SEP = '\\'; static const char PATH_SEP = '\\';
#else #else