diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2018-02-20 21:50:22 -0500 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2018-02-20 21:50:22 -0500 |
| commit | f6d7cfd710de1bf9d4f6eabab45570bc91941ee1 (patch) | |
| tree | 6aed4f8606e47c6ef21c5b1d8bbf7cafa694af6e /lib/common/Test.h | |
| parent | c81b92946b58b90fe9679a476338e2d2dec8df67 (diff) | |
| parent | f28f88e5e72ba1499409047a9d6985eb312c0232 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'lib/common/Test.h')
| -rw-r--r-- | lib/common/Test.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/common/Test.h b/lib/common/Test.h index 36cd6a59..4b5cef61 100644 --- a/lib/common/Test.h +++ b/lib/common/Test.h @@ -243,12 +243,14 @@ void safe_sleep(int seconds); std::auto_ptr<Configuration> load_config_file(const std::string& config_file, const ConfigurationVerify& verify); -#ifdef _MSC_VER - // Our CMakeFiles compile tests to different executable filenames, - // e.g. test_common.exe instead of _test.exe. - #define TEST_EXECUTABLE BOX_MODULE ".exe" -#else - #define TEST_EXECUTABLE "./_test" -#endif +#ifndef TEST_EXECUTABLE +# ifdef _MSC_VER + // Our CMakeFiles compile tests to different executable filenames, + // e.g. test_common.exe instead of _test.exe. + #define TEST_EXECUTABLE BOX_MODULE ".exe" +# else + #define TEST_EXECUTABLE "./_test" +# endif +#endif // TEST_EXECUTABLE #endif // TEST__H |