diff options
| author | Jisi Liu <liujisi@google.com> | 2017-09-21 15:24:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-21 15:24:31 -0700 |
| commit | c627530946e5d8783c1d9c2bbeb1704e4e868963 (patch) | |
| tree | 5483f40a268e3dfe870aef1dee8ea6a41d49604d | |
| parent | 4fc75296c781e851b887da6d05fed722acf3373b (diff) | |
| parent | b091bfb07bcf83972c76130d21bac3ed1b4b707a (diff) | |
| download | protobuf-c627530946e5d8783c1d9c2bbeb1704e4e868963.tar.gz protobuf-c627530946e5d8783c1d9c2bbeb1704e4e868963.tar.bz2 protobuf-c627530946e5d8783c1d9c2bbeb1704e4e868963.zip | |
Merge pull request #3674 from pherl/shutdown
Test Shutdown can be called multiple times.
| -rw-r--r-- | src/google/protobuf/testing/googletest.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/google/protobuf/testing/googletest.cc b/src/google/protobuf/testing/googletest.cc index 33a75ed6..91f0ef89 100644 --- a/src/google/protobuf/testing/googletest.cc +++ b/src/google/protobuf/testing/googletest.cc @@ -286,6 +286,8 @@ namespace { struct ForceShutdown { ~ForceShutdown() { ShutdownProtobufLibrary(); + // Test to shutdown the library twice, which should succeed. + ShutdownProtobufLibrary(); } } force_shutdown; |