diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index fb74a7ae6b83e..0887aaa970b36 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -142,10 +142,6 @@ EXPERIMENTS = { "core_end2end_test": [ "event_engine_client", "event_engine_dns_non_client_channel", - "work_serializer_dispatch", - ], - "cpp_end2end_test": [ - "work_serializer_dispatch", "local_connector_secure", ], "endpoint_test": [ diff --git a/test/core/experiments/experiments_test.cc b/test/core/experiments/experiments_test.cc index 50e40d4af701e..f604efa05ffb9 100644 --- a/test/core/experiments/experiments_test.cc +++ b/test/core/experiments/experiments_test.cc @@ -14,103 +14,81 @@ // Auto generated by tools/codegen/core/gen_experiments.py - -#include - #include "test/core/experiments/fixtures/experiments.h" #include #include "gtest/gtest.h" +#include + #include "src/core/lib/experiments/config.h" #ifndef GRPC_EXPERIMENTS_ARE_FINAL #if defined(GRPC_CFSTREAM) -bool GetExperimentTestExperiment1ExpectedValue() { -return false; -} +bool GetExperimentTestExperiment1ExpectedValue() { return false; } -bool GetExperimentTestExperiment2ExpectedValue() { -return true; -} +bool GetExperimentTestExperiment2ExpectedValue() { return true; } bool GetExperimentTestExperiment3ExpectedValue() { - #ifdef NDEBUG -return false; + return false; #else -return true; + return true; #endif - } -bool GetExperimentTestExperiment4ExpectedValue() { -return true; -} +bool GetExperimentTestExperiment4ExpectedValue() { return true; } #elif defined(GPR_WINDOWS) -bool GetExperimentTestExperiment1ExpectedValue() { -return false; -} +bool GetExperimentTestExperiment1ExpectedValue() { return false; } -bool GetExperimentTestExperiment2ExpectedValue() { -return false; -} +bool GetExperimentTestExperiment2ExpectedValue() { return false; } bool GetExperimentTestExperiment3ExpectedValue() { #ifdef NDEBUG -return false; + return false; #else -return true; + return true; #endif - } -bool GetExperimentTestExperiment4ExpectedValue() { -return true; -} +bool GetExperimentTestExperiment4ExpectedValue() { return true; } #else bool GetExperimentTestExperiment1ExpectedValue() { #ifdef NDEBUG -return false; + return false; #else -return true; + return true; #endif - } bool GetExperimentTestExperiment2ExpectedValue() { #ifdef NDEBUG -return false; + return false; #else -return true; + return true; #endif - } bool GetExperimentTestExperiment3ExpectedValue() { #ifdef NDEBUG -return false; + return false; #else -return true; + return true; #endif - } -bool GetExperimentTestExperiment4ExpectedValue() { -return false; -} +bool GetExperimentTestExperiment4ExpectedValue() { return false; } #endif TEST(ExperimentsTest, CheckExperimentValuesTest) { - ASSERT_EQ(grpc_core::IsTestExperiment1Enabled(), GetExperimentTestExperiment1ExpectedValue()); @@ -122,15 +100,13 @@ TEST(ExperimentsTest, CheckExperimentValuesTest) { ASSERT_EQ(grpc_core::IsTestExperiment4Enabled(), GetExperimentTestExperiment4ExpectedValue()); - } -#endif // GRPC_EXPERIMENTS_ARE_FINAL +#endif // GRPC_EXPERIMENTS_ARE_FINAL int main(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); grpc_core::LoadTestOnlyExperimentsFromMetadata( - grpc_core::g_test_experiment_metadata, grpc_core::kNumTestExperiments); + grpc_core::g_test_experiment_metadata, grpc_core::kNumTestExperiments); return RUN_ALL_TESTS(); } - diff --git a/test/core/experiments/fixtures/experiments.cc b/test/core/experiments/fixtures/experiments.cc index 259e1441ad2f9..8352ffb7ee432 100644 --- a/test/core/experiments/fixtures/experiments.cc +++ b/test/core/experiments/fixtures/experiments.cc @@ -14,10 +14,10 @@ // Auto generated by tools/codegen/core/gen_experiments.py -#include - #include "test/core/experiments/fixtures/experiments.h" +#include + #ifndef GRPC_EXPERIMENTS_ARE_FINAL #if defined(GRPC_CFSTREAM) @@ -35,15 +35,20 @@ const bool kDefaultForDebugOnly = false; #else const bool kDefaultForDebugOnly = true; #endif -} +} // namespace namespace grpc_core { const ExperimentMetadata g_test_experiment_metadata[] = { - {"test_experiment_1", description_test_experiment_1, additional_constraints_test_experiment_1, nullptr, 0, false, true}, - {"test_experiment_2", description_test_experiment_2, additional_constraints_test_experiment_2, nullptr, 0, true, true}, - {"test_experiment_3", description_test_experiment_3, additional_constraints_test_experiment_3, nullptr, 0, kDefaultForDebugOnly, true}, - {"test_experiment_4", description_test_experiment_4, additional_constraints_test_experiment_4, nullptr, 0, true, true}, + {"test_experiment_1", description_test_experiment_1, + additional_constraints_test_experiment_1, nullptr, 0, false, true}, + {"test_experiment_2", description_test_experiment_2, + additional_constraints_test_experiment_2, nullptr, 0, true, true}, + {"test_experiment_3", description_test_experiment_3, + additional_constraints_test_experiment_3, nullptr, 0, kDefaultForDebugOnly, + true}, + {"test_experiment_4", description_test_experiment_4, + additional_constraints_test_experiment_4, nullptr, 0, true, true}, }; } // namespace grpc_core @@ -63,15 +68,20 @@ const bool kDefaultForDebugOnly = false; #else const bool kDefaultForDebugOnly = true; #endif -} +} // namespace namespace grpc_core { const ExperimentMetadata g_test_experiment_metadata[] = { - {"test_experiment_1", description_test_experiment_1, additional_constraints_test_experiment_1, nullptr, 0, false, true}, - {"test_experiment_2", description_test_experiment_2, additional_constraints_test_experiment_2, nullptr, 0, false, true}, - {"test_experiment_3", description_test_experiment_3, additional_constraints_test_experiment_3, nullptr, 0, kDefaultForDebugOnly, true}, - {"test_experiment_4", description_test_experiment_4, additional_constraints_test_experiment_4, nullptr, 0, true, true}, + {"test_experiment_1", description_test_experiment_1, + additional_constraints_test_experiment_1, nullptr, 0, false, true}, + {"test_experiment_2", description_test_experiment_2, + additional_constraints_test_experiment_2, nullptr, 0, false, true}, + {"test_experiment_3", description_test_experiment_3, + additional_constraints_test_experiment_3, nullptr, 0, kDefaultForDebugOnly, + true}, + {"test_experiment_4", description_test_experiment_4, + additional_constraints_test_experiment_4, nullptr, 0, true, true}, }; } // namespace grpc_core @@ -91,15 +101,22 @@ const bool kDefaultForDebugOnly = false; #else const bool kDefaultForDebugOnly = true; #endif -} +} // namespace namespace grpc_core { const ExperimentMetadata g_test_experiment_metadata[] = { - {"test_experiment_1", description_test_experiment_1, additional_constraints_test_experiment_1, nullptr, 0, kDefaultForDebugOnly, true}, - {"test_experiment_2", description_test_experiment_2, additional_constraints_test_experiment_2, nullptr, 0, kDefaultForDebugOnly, true}, - {"test_experiment_3", description_test_experiment_3, additional_constraints_test_experiment_3, nullptr, 0, kDefaultForDebugOnly, true}, - {"test_experiment_4", description_test_experiment_4, additional_constraints_test_experiment_4, nullptr, 0, false, true}, + {"test_experiment_1", description_test_experiment_1, + additional_constraints_test_experiment_1, nullptr, 0, kDefaultForDebugOnly, + true}, + {"test_experiment_2", description_test_experiment_2, + additional_constraints_test_experiment_2, nullptr, 0, kDefaultForDebugOnly, + true}, + {"test_experiment_3", description_test_experiment_3, + additional_constraints_test_experiment_3, nullptr, 0, kDefaultForDebugOnly, + true}, + {"test_experiment_4", description_test_experiment_4, + additional_constraints_test_experiment_4, nullptr, 0, false, true}, }; } // namespace grpc_core diff --git a/test/core/experiments/fixtures/experiments.h b/test/core/experiments/fixtures/experiments.h index c154226712c22..4d7df0b806417 100644 --- a/test/core/experiments/fixtures/experiments.h +++ b/test/core/experiments/fixtures/experiments.h @@ -63,13 +63,13 @@ inline bool IsTestExperiment2Enabled() { return true; } #ifndef NDEBUG #define GRPC_EXPERIMENT_IS_INCLUDED_TEST_EXPERIMENT_3 #endif -inline bool IsTestExperiment3Enabled() { +inline bool IsTestExperiment3Enabled() { #ifdef NDEBUG -return false; + return false; #else -return true; + return true; #endif - } +} #define GRPC_EXPERIMENT_IS_INCLUDED_TEST_EXPERIMENT_4 inline bool IsTestExperiment4Enabled() { return true; } @@ -79,13 +79,13 @@ inline bool IsTestExperiment2Enabled() { return false; } #ifndef NDEBUG #define GRPC_EXPERIMENT_IS_INCLUDED_TEST_EXPERIMENT_3 #endif -inline bool IsTestExperiment3Enabled() { +inline bool IsTestExperiment3Enabled() { #ifdef NDEBUG -return false; + return false; #else -return true; + return true; #endif - } +} #define GRPC_EXPERIMENT_IS_INCLUDED_TEST_EXPERIMENT_4 inline bool IsTestExperiment4Enabled() { return true; } @@ -93,33 +93,33 @@ inline bool IsTestExperiment4Enabled() { return true; } #ifndef NDEBUG #define GRPC_EXPERIMENT_IS_INCLUDED_TEST_EXPERIMENT_1 #endif -inline bool IsTestExperiment1Enabled() { +inline bool IsTestExperiment1Enabled() { #ifdef NDEBUG -return false; + return false; #else -return true; + return true; #endif - } +} #ifndef NDEBUG #define GRPC_EXPERIMENT_IS_INCLUDED_TEST_EXPERIMENT_2 #endif -inline bool IsTestExperiment2Enabled() { +inline bool IsTestExperiment2Enabled() { #ifdef NDEBUG -return false; + return false; #else -return true; + return true; #endif - } +} #ifndef NDEBUG #define GRPC_EXPERIMENT_IS_INCLUDED_TEST_EXPERIMENT_3 #endif -inline bool IsTestExperiment3Enabled() { +inline bool IsTestExperiment3Enabled() { #ifdef NDEBUG -return false; + return false; #else -return true; + return true; #endif - } +} inline bool IsTestExperiment4Enabled() { return false; } #endif @@ -132,13 +132,21 @@ enum ExperimentIds { kNumTestExperiments }; #define GRPC_EXPERIMENT_IS_INCLUDED_TEST_EXPERIMENT_1 -inline bool IsTestExperiment1Enabled() { return IsTestExperimentEnabled(); } +inline bool IsTestExperiment1Enabled() { + return IsTestExperimentEnabled(); +} #define GRPC_EXPERIMENT_IS_INCLUDED_TEST_EXPERIMENT_2 -inline bool IsTestExperiment2Enabled() { return IsTestExperimentEnabled(); } +inline bool IsTestExperiment2Enabled() { + return IsTestExperimentEnabled(); +} #define GRPC_EXPERIMENT_IS_INCLUDED_TEST_EXPERIMENT_3 -inline bool IsTestExperiment3Enabled() { return IsTestExperimentEnabled(); } +inline bool IsTestExperiment3Enabled() { + return IsTestExperimentEnabled(); +} #define GRPC_EXPERIMENT_IS_INCLUDED_TEST_EXPERIMENT_4 -inline bool IsTestExperiment4Enabled() { return IsTestExperimentEnabled(); } +inline bool IsTestExperiment4Enabled() { + return IsTestExperimentEnabled(); +} extern const ExperimentMetadata g_test_experiment_metadata[kNumTestExperiments];