Merge pull request #3674 from pherl/shutdown

Test Shutdown can be called multiple times.

Merge pull request #3674 from pherl/shutdown
Test Shutdown can be called multiple times.
c6275309 · Jisi Liu · GitHub · 4fc75296 · b091bfb0 · c6275309
Commit c6275309 authored Sep 21, 2017 by Jisi Liu Committed by GitHub Sep 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

googletest.cc src/google/protobuf/testing/googletest.cc +2 -0

No files found.
--- 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;