diff options
author | Konstantin Podsvirov <konstantin@podsvirov.pro> | 2015-09-15 15:01:05 +0300 |
---|---|---|
committer | Konstantin Podsvirov <konstantin@podsvirov.pro> | 2015-09-15 15:01:05 +0300 |
commit | 2fa0439b0074c61d48fa6120d0734ae8c1e5debb (patch) | |
tree | 53b28356c9ab4d8a6c9d7dc1a6547c17e61046f0 /src | |
parent | 905f46403582ca2c43e1ad249dd01fa97191c4d0 (diff) | |
download | protobuf-2fa0439b0074c61d48fa6120d0734ae8c1e5debb.tar.gz protobuf-2fa0439b0074c61d48fa6120d0734ae8c1e5debb.tar.bz2 protobuf-2fa0439b0074c61d48fa6120d0734ae8c1e5debb.zip |
Improved testing from CMake project
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/compiler/command_line_interface_unittest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc index 9560d0e0..3935de51 100644 --- a/src/google/protobuf/compiler/command_line_interface_unittest.cc +++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc @@ -314,12 +314,16 @@ void CommandLineInterfaceTest::Run(const string& command) { string plugin_path; +#ifdef GOOGLE_PROTOBUF_TEST_PLUGIN_PATH + plugin_path = GOOGLE_PROTOBUF_TEST_PLUGIN_PATH; +#else for (int i = 0; i < GOOGLE_ARRAYSIZE(possible_paths); i++) { if (access(possible_paths[i], F_OK) == 0) { plugin_path = possible_paths[i]; break; } } +#endif if (plugin_path.empty()) { #else |