diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-02-12 18:52:07 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-02-12 18:52:07 -0800 |
| commit | 13126664ec65bb384ac44188c72f273f7d3d42d5 (patch) | |
| tree | 8310b94b5d5ac97fc3229aa0d28b9ad12b1a4213 /templates/vsprojects | |
| parent | 451a227ac3fbede3bfce9bef9dbbe889f6956933 (diff) | |
fixed GrpcTests.mak and removed build_and_run_tests.bat
Diffstat (limited to 'templates/vsprojects')
| -rw-r--r-- | templates/vsprojects/vs2013/GrpcTests.mak.template | 9 | ||||
| -rw-r--r-- | templates/vsprojects/vs2013/build_and_run_tests.bat.template | 40 |
2 files changed, 8 insertions, 41 deletions
diff --git a/templates/vsprojects/vs2013/GrpcTests.mak.template b/templates/vsprojects/vs2013/GrpcTests.mak.template index d8867a8516..d239801c7d 100644 --- a/templates/vsprojects/vs2013/GrpcTests.mak.template +++ b/templates/vsprojects/vs2013/GrpcTests.mak.template @@ -14,7 +14,7 @@ gpr_test_util: MSBuild.exe gpr_test_util.vcxproj /p:Configuration=Debug grpc_test_util: - MSBuild.exe gprc_test_util.vcxproj /p:Configuration=Debug + MSBuild.exe grpc_test_util.vcxproj /p:Configuration=Debug $(OUT_DIR): mkdir $(OUT_DIR) @@ -33,6 +33,13 @@ ${target.name} \ echo All tests ran. +test_gpr: \ +% for target in [ tgt for tgt in test_targets if tgt.name.startswith('gpr_')]: +${target.name} \ +% endfor + + echo All tests ran. + % for target in test_targets: ${target.name}.exe: grpc_test_util echo Building ${target.name} diff --git a/templates/vsprojects/vs2013/build_and_run_tests.bat.template b/templates/vsprojects/vs2013/build_and_run_tests.bat.template deleted file mode 100644 index edf18ac88b..0000000000 --- a/templates/vsprojects/vs2013/build_and_run_tests.bat.template +++ /dev/null @@ -1,40 +0,0 @@ -<%! - import re -%>\ -<%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\ -<% - allowed_dependencies = set(['gpr', 'grpc', 'gpr_test_util', 'grpc_test_util']) - test_targets = [ target for target in targets if target.name.endswith('_test') and set(target.deps).issubset(allowed_dependencies)] - test_bin_dir = 'test_bin' -%>\ -@rem Build and runs unit all unit tests - -@rem Set VS variables -@call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" x86 - -@rem Build the library dependencies first -MSBuild.exe gprc_test_util.vcxproj /p:Configuration=Debug - -mkdir ${test_bin_dir} - -% for target in test_targets: -echo Building ${target.name} -cl.exe /c /I..\.. /I..\..\include /nologo /Z7 /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:${test_bin_dir}\ \ -%for source in target.src: -..\..\${to_windows_path(source)} \ -%endfor - -link.exe /DEBUG /OUT:"${test_bin_dir}\${target.name}.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 \ -%for dep in target.deps: -Debug\${dep}.lib \ -%endfor -%for source in target.src: -${test_bin_dir}\${re.search('([^/]+)\.c$', source).group(1)}.obj \ -%endfor - -echo( -echo Running test ${target.name} -${test_bin_dir}\${target.name}.exe || echo TEST FAILED: ${target.name} && exit /b -echo( - -% endfor
\ No newline at end of file |