Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean build.json

Browse Source
pull/424/head
Craig Tiller 10 years ago
parent 8a7424ad90
commit 1ffa52f6dc
4 changed files with 328 additions and 328 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 474
      Makefile
  2. 130
      build.json
  3. 20
      tools/run_tests/tests.json
  4. 32
      vsprojects/vs2013/build_and_run_tests.bat

474
Makefile
View File

File diff suppressed because one or more lines are too long

130
build.json
Unescape View File

@ -325,6 +325,18 @@
"secure": true, "secure": true,
"vs_project_guid": "{29D16885-7228-4C31-81ED-5F9187C7F2A9}" "vs_project_guid": "{29D16885-7228-4C31-81ED-5F9187C7F2A9}"
}, },
{
"name": "grpc_csharp_ext",
"build": "all",
"language": "c",
"src": [
"src/csharp/ext/grpc_csharp_ext.c"
],
"deps": [
"gpr",
"grpc"
]
},
{ {
"name": "grpc_test_util", "name": "grpc_test_util",
"build": "private", "build": "private",
@ -448,18 +460,6 @@
"grpc", "grpc",
"gpr" "gpr"
] ]
},
{
"name": "grpc_csharp_ext",
"build": "all",
"language": "c",
"deps": [
"gpr",
"grpc"
],
"src": [
"src/csharp/ext/grpc_csharp_ext.c"
]
} }
], ],
"targets": [ "targets": [
@ -897,11 +897,11 @@
] ]
}, },
{ {
"name": "gpr_histogram_test", "name": "gpr_env_test",
"build": "test", "build": "test",
"language": "c", "language": "c",
"src": [ "src": [
"test/core/support/histogram_test.c" "test/core/support/env_test.c"
], ],
"deps": [ "deps": [
"gpr_test_util", "gpr_test_util",
@ -909,11 +909,11 @@
] ]
}, },
{ {
"name": "gpr_host_port_test", "name": "gpr_file_test",
"build": "test", "build": "test",
"language": "c", "language": "c",
"src": [ "src": [
"test/core/support/host_port_test.c" "test/core/support/file_test.c"
], ],
"deps": [ "deps": [
"gpr_test_util", "gpr_test_util",
@ -921,11 +921,11 @@
] ]
}, },
{ {
"name": "gpr_log_test", "name": "gpr_histogram_test",
"build": "test", "build": "test",
"language": "c", "language": "c",
"src": [ "src": [
"test/core/support/log_test.c" "test/core/support/histogram_test.c"
], ],
"deps": [ "deps": [
"gpr_test_util", "gpr_test_util",
@ -933,11 +933,11 @@
] ]
}, },
{ {
"name": "gpr_file_test", "name": "gpr_host_port_test",
"build": "test", "build": "test",
"language": "c", "language": "c",
"src": [ "src": [
"test/core/support/file_test.c" "test/core/support/host_port_test.c"
], ],
"deps": [ "deps": [
"gpr_test_util", "gpr_test_util",
@ -945,11 +945,11 @@
] ]
}, },
{ {
"name": "gpr_env_test", "name": "gpr_log_test",
"build": "test", "build": "test",
"language": "c", "language": "c",
"src": [ "src": [
"test/core/support/env_test.c" "test/core/support/log_test.c"
], ],
"deps": [ "deps": [
"gpr_test_util", "gpr_test_util",
@ -1612,32 +1612,31 @@
"run": false "run": false
}, },
{ {
"name": "tips_client", "name": "qps_client",
"build": "test", "build": "test",
"language": "c++", "language": "c++",
"src": [ "src": [
"examples/tips/main.cc" "test/cpp/qps/qpstest.proto",
"test/cpp/qps/client.cc"
], ],
"deps": [ "deps": [
"tips_client_lib",
"grpc++_test_util", "grpc++_test_util",
"grpc_test_util", "grpc_test_util",
"grpc++", "grpc++",
"grpc", "grpc",
"gpr_test_util", "gpr_test_util",
"gpr" "gpr"
], ]
"run": false
}, },
{ {
"name": "tips_publisher_test", "name": "qps_server",
"build": "test", "build": "test",
"language": "c++", "language": "c++",
"src": [ "src": [
"examples/tips/publisher_test.cc" "test/cpp/qps/qpstest.proto",
"test/cpp/qps/server.cc"
], ],
"deps": [ "deps": [
"tips_client_lib",
"grpc++_test_util", "grpc++_test_util",
"grpc_test_util", "grpc_test_util",
"grpc++", "grpc++",
@ -1647,15 +1646,30 @@
] ]
}, },
{ {
"name": "tips_subscriber_test", "name": "ruby_plugin",
"build": "protoc",
"language": "c++",
"headers": [
"src/compiler/cpp_generator.h",
"src/compiler/cpp_generator_helpers-inl.h",
"src/compiler/cpp_generator_map-inl.h",
"src/compiler/cpp_generator_string-inl.h"
],
"src": [
"src/compiler/ruby_generator.cc",
"src/compiler/ruby_plugin.cc"
],
"deps": [],
"secure": false
},
{
"name": "status_test",
"build": "test", "build": "test",
"language": "c++", "language": "c++",
"src": [ "src": [
"examples/tips/subscriber_test.cc" "test/cpp/util/status_test.cc"
], ],
"deps": [ "deps": [
"tips_client_lib",
"grpc++_test_util",
"grpc_test_util", "grpc_test_util",
"grpc++", "grpc++",
"grpc", "grpc",
@ -1664,12 +1678,11 @@
] ]
}, },
{ {
"name": "qps_client", "name": "sync_client_async_server_test",
"build": "test", "build": "test",
"language": "c++", "language": "c++",
"src": [ "src": [
"test/cpp/qps/qpstest.proto", "test/cpp/end2end/sync_client_async_server_test.cc"
"test/cpp/qps/client.cc"
], ],
"deps": [ "deps": [
"grpc++_test_util", "grpc++_test_util",
@ -1681,15 +1694,13 @@
] ]
}, },
{ {
"name": "qps_server", "name": "thread_pool_test",
"build": "test", "build": "test",
"language": "c++", "language": "c++",
"src": [ "src": [
"test/cpp/qps/qpstest.proto", "test/cpp/server/thread_pool_test.cc"
"test/cpp/qps/server.cc"
], ],
"deps": [ "deps": [
"grpc++_test_util",
"grpc_test_util", "grpc_test_util",
"grpc++", "grpc++",
"grpc", "grpc",
@ -1698,45 +1709,32 @@
] ]
}, },
{ {
"name": "ruby_plugin", "name": "tips_client",
"build": "protoc",
"language": "c++",
"headers": [
"src/compiler/cpp_generator.h",
"src/compiler/cpp_generator_helpers-inl.h",
"src/compiler/cpp_generator_map-inl.h",
"src/compiler/cpp_generator_string-inl.h"
],
"src": [
"src/compiler/ruby_generator.cc",
"src/compiler/ruby_plugin.cc"
],
"deps": [],
"secure": false
},
{
"name": "status_test",
"build": "test", "build": "test",
"language": "c++", "language": "c++",
"src": [ "src": [
"test/cpp/util/status_test.cc" "examples/tips/main.cc"
], ],
"deps": [ "deps": [
"tips_client_lib",
"grpc++_test_util",
"grpc_test_util", "grpc_test_util",
"grpc++", "grpc++",
"grpc", "grpc",
"gpr_test_util", "gpr_test_util",
"gpr" "gpr"
] ],
"run": false
}, },
{ {
"name": "sync_client_async_server_test", "name": "tips_publisher_test",
"build": "test", "build": "test",
"language": "c++", "language": "c++",
"src": [ "src": [
"test/cpp/end2end/sync_client_async_server_test.cc" "examples/tips/publisher_test.cc"
], ],
"deps": [ "deps": [
"tips_client_lib",
"grpc++_test_util", "grpc++_test_util",
"grpc_test_util", "grpc_test_util",
"grpc++", "grpc++",
@ -1746,13 +1744,15 @@
] ]
}, },
{ {
"name": "thread_pool_test", "name": "tips_subscriber_test",
"build": "test", "build": "test",
"language": "c++", "language": "c++",
"src": [ "src": [
"test/cpp/server/thread_pool_test.cc" "examples/tips/subscriber_test.cc"
], ],
"deps": [ "deps": [
"tips_client_lib",
"grpc++_test_util",
"grpc_test_util", "grpc_test_util",
"grpc++", "grpc++",
"grpc", "grpc",

20
tools/run_tests/tests.json
Unescape View File

@ -99,23 +99,23 @@
}, },
{ {
"language": "c", "language": "c",
"name": "gpr_histogram_test" "name": "gpr_env_test"
}, },
{ {
"language": "c", "language": "c",
"name": "gpr_host_port_test" "name": "gpr_file_test"
}, },
{ {
"language": "c", "language": "c",
"name": "gpr_log_test" "name": "gpr_histogram_test"
}, },
{ {
"language": "c", "language": "c",
"name": "gpr_file_test" "name": "gpr_host_port_test"
}, },
{ {
"language": "c", "language": "c",
"name": "gpr_env_test" "name": "gpr_log_test"
}, },
{ {
"language": "c", "language": "c",
@ -279,23 +279,23 @@
}, },
{ {
"language": "c++", "language": "c++",
"name": "tips_publisher_test" "name": "status_test"
}, },
{ {
"language": "c++", "language": "c++",
"name": "tips_subscriber_test" "name": "sync_client_async_server_test"
}, },
{ {
"language": "c++", "language": "c++",
"name": "status_test" "name": "thread_pool_test"
}, },
{ {
"language": "c++", "language": "c++",
"name": "sync_client_async_server_test" "name": "tips_publisher_test"
}, },
{ {
"language": "c++", "language": "c++",
"name": "thread_pool_test" "name": "tips_subscriber_test"
}, },
{ {
"language": "c", "language": "c",

32
vsprojects/vs2013/build_and_run_tests.bat
Unescape View File

@ -25,6 +25,22 @@ echo Running test gpr_cmdline_test
test_bin\gpr_cmdline_test.exe || echo TEST FAILED: gpr_cmdline_test && exit /b test_bin\gpr_cmdline_test.exe || echo TEST FAILED: gpr_cmdline_test && exit /b
echo( echo(
echo Building test gpr_env_test
cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\env_test.c
link.exe /OUT:"test_bin\gpr_env_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\env_test.obj
echo(
echo Running test gpr_env_test
test_bin\gpr_env_test.exe || echo TEST FAILED: gpr_env_test && exit /b
echo(
echo Building test gpr_file_test
cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\file_test.c
link.exe /OUT:"test_bin\gpr_file_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\file_test.obj
echo(
echo Running test gpr_file_test
test_bin\gpr_file_test.exe || echo TEST FAILED: gpr_file_test && exit /b
echo(
echo Building test gpr_histogram_test echo Building test gpr_histogram_test
cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\histogram_test.c cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\histogram_test.c
link.exe /OUT:"test_bin\gpr_histogram_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\histogram_test.obj link.exe /OUT:"test_bin\gpr_histogram_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\histogram_test.obj
@ -49,22 +65,6 @@ echo Running test gpr_log_test
test_bin\gpr_log_test.exe || echo TEST FAILED: gpr_log_test && exit /b test_bin\gpr_log_test.exe || echo TEST FAILED: gpr_log_test && exit /b
echo( echo(
echo Building test gpr_file_test
cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\file_test.c
link.exe /OUT:"test_bin\gpr_file_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\file_test.obj
echo(
echo Running test gpr_file_test
test_bin\gpr_file_test.exe || echo TEST FAILED: gpr_file_test && exit /b
echo(
echo Building test gpr_env_test
cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\env_test.c
link.exe /OUT:"test_bin\gpr_env_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\env_test.obj
echo(
echo Running test gpr_env_test
test_bin\gpr_env_test.exe || echo TEST FAILED: gpr_env_test && exit /b
echo(
echo Building test gpr_slice_buffer_test echo Building test gpr_slice_buffer_test
cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\slice_buffer_test.c cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\slice_buffer_test.c
link.exe /OUT:"test_bin\gpr_slice_buffer_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\slice_buffer_test.obj link.exe /OUT:"test_bin\gpr_slice_buffer_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\slice_buffer_test.obj

Write Preview
Loading…
Cancel
Save