diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2015-06-15 16:31:17 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-06-15 16:31:17 -0700 |
commit | 4479076bbdeb091fb752546390e902daa54e42d2 (patch) | |
tree | 9a715963e5a5ce08f538b6f419205a854691ad4f /src/google | |
parent | 6f56b1a6917d8177df4ca688b69fe545eafa7928 (diff) | |
parent | 1ecef1a2f5b1063e2f8f4616508386543905466f (diff) | |
download | protobuf-4479076bbdeb091fb752546390e902daa54e42d2.tar.gz protobuf-4479076bbdeb091fb752546390e902daa54e42d2.tar.bz2 protobuf-4479076bbdeb091fb752546390e902daa54e42d2.zip |
Merge pull request #488 from AustinSchuh/ruby_test_fix
Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUF
Diffstat (limited to 'src/google')
-rw-r--r-- | src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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 |