aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/testing
diff options
context:
space:
mode:
authorGravatar Bo Yang <teboring@google.com>2015-04-27 17:44:45 -0700
committerGravatar Bo Yang <teboring@google.com>2015-04-27 17:44:45 -0700
commit46bd60b92f593a62e150c93cb8761148f6830b47 (patch)
tree26e73b5bc85f00817238685705fa29a1d39236ac /src/google/protobuf/testing
parent9a121853236a8c77693f14d21d27987e5832176a (diff)
Modify directory to use in test
Change-Id: Iede1dc4e70427663e0d3c5304fa86b3aebf492b7
Diffstat (limited to 'src/google/protobuf/testing')
-rw-r--r--src/google/protobuf/testing/googletest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/google/protobuf/testing/googletest.cc b/src/google/protobuf/testing/googletest.cc
index d72fa5c0..5f6a199a 100644
--- a/src/google/protobuf/testing/googletest.cc
+++ b/src/google/protobuf/testing/googletest.cc
@@ -65,6 +65,7 @@ namespace protobuf {
#endif
string TestSourceDir() {
+#ifndef GOOGLE_THIRD_PARTY_PROTOBUF
#ifdef _MSC_VER
// Look for the "src" directory.
string prefix = ".";
@@ -88,6 +89,9 @@ string TestSourceDir() {
return result;
}
#endif
+#else
+ return "third_party/protobuf/src";
+#endif // GOOGLE_THIRD_PARTY_PROTOBUF
}
namespace {