diff options
author | Bo Yang <teboring@google.com> | 2017-07-17 09:36:22 -0700 |
---|---|---|
committer | Bo Yang <teboring@google.com> | 2017-07-18 11:06:16 -0700 |
commit | 6ec0b7e4d1fb606c6572a946e4eae97273367e67 (patch) | |
tree | d983812539a3299ff130fff469140bdcd1bb1690 /src/google/protobuf/compiler/csharp | |
parent | 324b20a49170cb38d15ef243bc044026adb54ae1 (diff) | |
parent | 5532abc15b97f3489183b266b41844306052a3fa (diff) | |
download | protobuf-6ec0b7e4d1fb606c6572a946e4eae97273367e67.tar.gz protobuf-6ec0b7e4d1fb606c6572a946e4eae97273367e67.tar.bz2 protobuf-6ec0b7e4d1fb606c6572a946e4eae97273367e67.zip |
Merge 3.3.x into master
Diffstat (limited to 'src/google/protobuf/compiler/csharp')
-rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc b/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc index 4e44b578..5c54270e 100644 --- a/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc +++ b/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc @@ -134,6 +134,14 @@ class GenerateAndTest { }; TEST(CsharpBootstrapTest, GeneratedCsharpDescriptorMatches) { + // Skip this whole test if the csharp directory doesn't exist (i.e., a C++11 + // only distribution). + string descriptor_file_name = + "../csharp/src/Google.Protobuf/Reflection/Descriptor.cs"; + if (!File::Exists(TestSourceDir() + "/" + descriptor_file_name)) { + return; + } + MockErrorCollector error_collector; DiskSourceTree source_tree; Importer importer(&source_tree, &error_collector); |