From 2fa0439b0074c61d48fa6120d0734ae8c1e5debb Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Tue, 15 Sep 2015 15:01:05 +0300 Subject: Improved testing from CMake project --- src/google/protobuf/compiler/command_line_interface_unittest.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/google') 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 -- cgit v1.2.3