move definition of the INPUT_FOLDER variable from header to implementation file (917b7dd4) · Commits · 郑智淋 / lammps

unittest/force-styles/test_main.cpp

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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);

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -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