Revert workaround for std::mutex issues on github windows runners.

PiperOrigin-RevId: 648802955
pull/17473/head
Mike Kruskal 8 months ago committed by Sandy Zhang
parent 861be78460
commit ba3e7d7a8a
  1. 4
      protos/protos_extension_lock_test.cc
  2. 3
      src/google/protobuf/compiler/main.cc
  3. 3
      src/google/protobuf/compiler/main_no_generators.cc

@ -102,8 +102,6 @@ void TestConcurrentExtensionAccess(::protos::ExtensionRegistry registry) {
test_theme();
test_theme_extension();
}
#ifndef _MSC_VER
// TODO Re-enable this once github runner issue is resolved.
TEST(CppGeneratedCode, ConcurrentAccessDoesNotRaceBothLazy) {
::upb::Arena arena;
@ -122,7 +120,5 @@ TEST(CppGeneratedCode, ConcurrentAccessDoesNotRaceBothEager) {
{{&theme, &ThemeExtension::theme_extension}, arena});
}
#endif // _MSC_VER
} // namespace
} // namespace protos_generator::test::protos

@ -35,10 +35,7 @@ namespace protobuf {
namespace compiler {
int ProtobufMain(int argc, char* argv[]) {
#ifndef _MSC_VER
// TODO Re-enable this once github runner issue is resolved.
absl::InitializeLog();
#endif // !_MSC_VER
CommandLineInterface cli;
cli.AllowPlugins("protoc-");

@ -19,10 +19,7 @@ namespace compiler {
// This is a version of protoc that has no built-in code generators.
// See go/protobuf-toolchain-protoc
int ProtocMain(int argc, char* argv[]) {
#ifndef _MSC_VER
// TODO Re-enable this once github runner issue is resolved.
absl::InitializeLog();
#endif // !_MSC_VER
CommandLineInterface cli;
cli.AllowPlugins("protoc-");

Loading…
Cancel
Save