organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #488 from AustinSchuh/ruby_test_fix

Browse source 
Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUF
This commit is contained in:
Feng Xiao 2015-06-15 16:31:17 -07:00
commit 4479076bbd
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc
View file

@ -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