From 1ecef1a2f5b1063e2f8f4616508386543905466f Mon Sep 17 00:00:00 2001 From: Austin Schuh Date: Wed, 10 Jun 2015 23:33:07 -0700 Subject: Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUF --- src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc') diff --git a/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc b/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc index 6c203ab6..1b04cb32 100644 --- a/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc +++ b/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc @@ -47,6 +47,7 @@ namespace { string FindRubyTestDir(const string& file) { // Inspired by TestSourceDir() in src/google/protobuf/testing/googletest.cc. +#ifndef GOOGLE_THIRD_PARTY_PROTOBUF string prefix = "."; while (!File::Exists(prefix + "/src/google/protobuf/compiler/ruby" + file)) { if (!File::Exists(prefix)) { @@ -57,6 +58,9 @@ string FindRubyTestDir(const string& file) { prefix += "/.."; } return prefix + "/src/google/protobuf/compiler/ruby"; +#else + return "third_party/protobuf/src/google/protobuf/compiler/ruby"; +#endif // GOOGLE_THIRD_PARTY_PROTOBUF } // This test is a simple golden-file test over the output of the Ruby code -- cgit v1.2.3