diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/doxygen/Doxyfile.c++ | 2 | ||||
-rw-r--r-- | tools/doxygen/Doxyfile.c++.internal | 2 | ||||
-rw-r--r-- | tools/doxygen/Doxyfile.core | 2 | ||||
-rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 5 | ||||
-rw-r--r-- | tools/run_tests/generated/sources_and_headers.json | 67 | ||||
-rw-r--r-- | tools/run_tests/generated/tests.json | 48 |
6 files changed, 68 insertions, 58 deletions
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index ec1701a7a1..bf739857ff 100644 --- a/tools/doxygen/Doxyfile.c++ +++ b/tools/doxygen/Doxyfile.c++ @@ -910,13 +910,11 @@ include/grpc/support/atm_gcc_atomic.h \ include/grpc/support/atm_gcc_sync.h \ include/grpc/support/atm_windows.h \ include/grpc/support/avl.h \ -include/grpc/support/cmdline.h \ include/grpc/support/cpu.h \ include/grpc/support/log.h \ include/grpc/support/log_windows.h \ include/grpc/support/port_platform.h \ include/grpc/support/string_util.h \ -include/grpc/support/subprocess.h \ include/grpc/support/sync.h \ include/grpc/support/sync_custom.h \ include/grpc/support/sync_generic.h \ diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 14aa4c1ad3..3db9bdfae0 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -911,13 +911,11 @@ include/grpc/support/atm_gcc_atomic.h \ include/grpc/support/atm_gcc_sync.h \ include/grpc/support/atm_windows.h \ include/grpc/support/avl.h \ -include/grpc/support/cmdline.h \ include/grpc/support/cpu.h \ include/grpc/support/log.h \ include/grpc/support/log_windows.h \ include/grpc/support/port_platform.h \ include/grpc/support/string_util.h \ -include/grpc/support/subprocess.h \ include/grpc/support/sync.h \ include/grpc/support/sync_custom.h \ include/grpc/support/sync_generic.h \ diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core index 2e33f69bb1..35f925d32a 100644 --- a/tools/doxygen/Doxyfile.core +++ b/tools/doxygen/Doxyfile.core @@ -850,13 +850,11 @@ include/grpc/support/atm_gcc_atomic.h \ include/grpc/support/atm_gcc_sync.h \ include/grpc/support/atm_windows.h \ include/grpc/support/avl.h \ -include/grpc/support/cmdline.h \ include/grpc/support/cpu.h \ include/grpc/support/log.h \ include/grpc/support/log_windows.h \ include/grpc/support/port_platform.h \ include/grpc/support/string_util.h \ -include/grpc/support/subprocess.h \ include/grpc/support/sync.h \ include/grpc/support/sync_custom.h \ include/grpc/support/sync_generic.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 1f9c1b953b..9d8a229c8c 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -850,13 +850,11 @@ include/grpc/support/atm_gcc_atomic.h \ include/grpc/support/atm_gcc_sync.h \ include/grpc/support/atm_windows.h \ include/grpc/support/avl.h \ -include/grpc/support/cmdline.h \ include/grpc/support/cpu.h \ include/grpc/support/log.h \ include/grpc/support/log_windows.h \ include/grpc/support/port_platform.h \ include/grpc/support/string_util.h \ -include/grpc/support/subprocess.h \ include/grpc/support/sync.h \ include/grpc/support/sync_custom.h \ include/grpc/support/sync_generic.h \ @@ -1071,7 +1069,6 @@ src/core/lib/gpr/arena.cc \ src/core/lib/gpr/arena.h \ src/core/lib/gpr/atm.cc \ src/core/lib/gpr/avl.cc \ -src/core/lib/gpr/cmdline.cc \ src/core/lib/gpr/cpu_iphone.cc \ src/core/lib/gpr/cpu_linux.cc \ src/core/lib/gpr/cpu_posix.cc \ @@ -1100,8 +1097,6 @@ src/core/lib/gpr/string_posix.cc \ src/core/lib/gpr/string_util_windows.cc \ src/core/lib/gpr/string_windows.cc \ src/core/lib/gpr/string_windows.h \ -src/core/lib/gpr/subprocess_posix.cc \ -src/core/lib/gpr/subprocess_windows.cc \ src/core/lib/gpr/sync.cc \ src/core/lib/gpr/sync_posix.cc \ src/core/lib/gpr/sync_windows.cc \ diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 17e75cc2e9..2581f4f8f8 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -251,6 +251,22 @@ "deps": [ "gpr", "gpr_test_util", + "grpc_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c", + "name": "cmdline_test", + "src": [ + "test/core/util/cmdline_test.cc" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "gpr", + "gpr_test_util", "grpc", "grpc_test_util" ], @@ -610,21 +626,6 @@ "headers": [], "is_filegroup": false, "language": "c", - "name": "gpr_cmdline_test", - "src": [ - "test/core/gpr/cmdline_test.cc" - ], - "third_party": false, - "type": "target" - }, - { - "deps": [ - "gpr", - "gpr_test_util" - ], - "headers": [], - "is_filegroup": false, - "language": "c", "name": "gpr_cpu_test", "src": [ "test/core/gpr/cpu_test.cc" @@ -950,6 +951,7 @@ }, { "deps": [ + "cmdline", "gpr", "grpc" ], @@ -1050,6 +1052,7 @@ }, { "deps": [ + "cmdline", "gpr", "grpc" ], @@ -1099,6 +1102,7 @@ }, { "deps": [ + "cmdline", "gpr", "grpc" ], @@ -1393,7 +1397,9 @@ { "deps": [ "gpr", - "grpc" + "gpr_test_util", + "grpc", + "grpc_test_util" ], "headers": [], "is_filegroup": false, @@ -8164,6 +8170,23 @@ "deps": [ "gpr_base_headers" ], + "headers": [ + "test/core/util/cmdline.h" + ], + "is_filegroup": true, + "language": "c", + "name": "cmdline", + "src": [ + "test/core/util/cmdline.cc", + "test/core/util/cmdline.h" + ], + "third_party": false, + "type": "filegroup" + }, + { + "deps": [ + "gpr_base_headers" + ], "headers": [], "is_filegroup": true, "language": "c", @@ -8173,7 +8196,6 @@ "src/core/lib/gpr/arena.cc", "src/core/lib/gpr/atm.cc", "src/core/lib/gpr/avl.cc", - "src/core/lib/gpr/cmdline.cc", "src/core/lib/gpr/cpu_iphone.cc", "src/core/lib/gpr/cpu_linux.cc", "src/core/lib/gpr/cpu_posix.cc", @@ -8194,8 +8216,6 @@ "src/core/lib/gpr/string_posix.cc", "src/core/lib/gpr/string_util_windows.cc", "src/core/lib/gpr/string_windows.cc", - "src/core/lib/gpr/subprocess_posix.cc", - "src/core/lib/gpr/subprocess_windows.cc", "src/core/lib/gpr/sync.cc", "src/core/lib/gpr/sync_posix.cc", "src/core/lib/gpr/sync_windows.cc", @@ -8228,13 +8248,11 @@ "include/grpc/support/atm_gcc_sync.h", "include/grpc/support/atm_windows.h", "include/grpc/support/avl.h", - "include/grpc/support/cmdline.h", "include/grpc/support/cpu.h", "include/grpc/support/log.h", "include/grpc/support/log_windows.h", "include/grpc/support/port_platform.h", "include/grpc/support/string_util.h", - "include/grpc/support/subprocess.h", "include/grpc/support/sync.h", "include/grpc/support/sync_custom.h", "include/grpc/support/sync_generic.h", @@ -8277,13 +8295,11 @@ "include/grpc/support/atm_gcc_sync.h", "include/grpc/support/atm_windows.h", "include/grpc/support/avl.h", - "include/grpc/support/cmdline.h", "include/grpc/support/cpu.h", "include/grpc/support/log.h", "include/grpc/support/log_windows.h", "include/grpc/support/port_platform.h", "include/grpc/support/string_util.h", - "include/grpc/support/subprocess.h", "include/grpc/support/sync.h", "include/grpc/support/sync_custom.h", "include/grpc/support/sync_generic.h", @@ -9331,6 +9347,7 @@ }, { "deps": [ + "cmdline", "gpr", "gpr_test_util", "grpc_base", @@ -9353,6 +9370,7 @@ "test/core/util/port.h", "test/core/util/port_server_client.h", "test/core/util/slice_splitter.h", + "test/core/util/subprocess.h", "test/core/util/tracer_util.h", "test/core/util/trickle_endpoint.h" ], @@ -9391,6 +9409,9 @@ "test/core/util/port_server_client.h", "test/core/util/slice_splitter.cc", "test/core/util/slice_splitter.h", + "test/core/util/subprocess.h", + "test/core/util/subprocess_posix.cc", + "test/core/util/subprocess_windows.cc", "test/core/util/tracer_util.cc", "test/core/util/tracer_util.h", "test/core/util/trickle_endpoint.cc", diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index a176392044..0d65cc483c 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -300,6 +300,30 @@ "posix", "windows" ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": false, + "language": "c", + "name": "cmdline_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false + }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], "cpu_cost": 10, "exclude_configs": [], "exclude_iomgrs": [], @@ -752,30 +776,6 @@ "posix", "windows" ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "gpr_cmdline_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], "cpu_cost": 30, "exclude_configs": [], "exclude_iomgrs": [], |