Remove non-C# options from C#-only test protos

5 files changed, 4 insertions, 31 deletions

diff --git a/csharp/protos/map_unittest_proto3.proto b/csharp/protos/map_unittest_proto3.proto
index 1909f0b2..e43e858b 100644
--- a/csharp/protos/map_unittest_proto3.proto
+++ b/csharp/protos/map_unittest_proto3.proto
@@ -36,7 +36,6 @@
 // required fields in proto3.
 syntax = "proto3";
 
-option cc_enable_arenas = true;
 option csharp_namespace = "Google.Protobuf.TestProtos";
 
 import "unittest_proto3.proto";
diff --git a/csharp/protos/unittest_import_proto3.proto b/csharp/protos/unittest_import_proto3.proto
index f5fb3bc2..2e666822 100644
--- a/csharp/protos/unittest_import_proto3.proto
+++ b/csharp/protos/unittest_import_proto3.proto
@@ -36,22 +36,10 @@
 
 syntax = "proto3";
 
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do
-// "using namespace unittest_import = protobuf_unittest_import".
 package protobuf_unittest_import;
 
-option optimize_for = SPEED;
-option cc_enable_arenas = true;
-
-// Exercise the java_package option.
-option java_package = "com.google.protobuf.test";
 option csharp_namespace = "Google.Protobuf.TestProtos";
 
-// Do not set a java_outer_classname here to verify that Proto2 works without
-// one.
-
 // Test public import
 import public "unittest_import_public_proto3.proto";
 
diff --git a/csharp/protos/unittest_import_public_proto3.proto b/csharp/protos/unittest_import_public_proto3.proto
index d6f11e28..88c20799 100644
--- a/csharp/protos/unittest_import_public_proto3.proto
+++ b/csharp/protos/unittest_import_public_proto3.proto
@@ -34,7 +34,6 @@ syntax = "proto3";
 
 package protobuf_unittest_import;
 
-option java_package = "com.google.protobuf.test";
 option csharp_namespace = "Google.Protobuf.TestProtos";
 
 message PublicImportMessage {
diff --git a/csharp/protos/unittest_issues.proto b/csharp/protos/unittest_issues.proto
index 332c81dc..0d8793e1 100644
--- a/csharp/protos/unittest_issues.proto
+++ b/csharp/protos/unittest_issues.proto
@@ -7,7 +7,6 @@ syntax = "proto3";
 option csharp_namespace = "UnitTest.Issues.TestProtos";
 
 package unittest_issues;
-option optimize_for = SPEED;
 
 // Issue 307: when generating doubly-nested types, any references
 // should be of the form A.Types.B.Types.C.
diff --git a/csharp/protos/unittest_proto3.proto b/csharp/protos/unittest_proto3.proto
index 2277bb50..d22265cc 100644
--- a/csharp/protos/unittest_proto3.proto
+++ b/csharp/protos/unittest_proto3.proto
@@ -36,28 +36,16 @@
 
 syntax = "proto3";
 
-// Some generic_services option(s) added automatically.
-// See:  http://go/proto2-generic-services-default
-option cc_generic_services = true;     // auto-added
-option java_generic_services = true;   // auto-added
-option py_generic_services = true;     // auto-added
-option cc_enable_arenas = true;
 option csharp_namespace = "Google.Protobuf.TestProtos";
 
+// Only present so we can test that we can read it (as an example
+// of a non-C# option)
+option java_outer_classname = "UnittestProto";
+
 import "unittest_import_proto3.proto";
 
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do "using namespace unittest = protobuf_unittest".
 package protobuf_unittest3;
 
-// Protos optimized for SPEED use a strict superset of the generated code
-// of equivalent ones optimized for CODE_SIZE, so we should optimize all our
-// tests for speed unless explicitly testing code size optimization.
-option optimize_for = SPEED;
-
-option java_outer_classname = "UnittestProto";
-
 // This proto includes every type of field in both singular and repeated
 // forms.
 message TestAllTypes {