diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-01-28 11:05:18 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-01-28 11:05:18 -0800 |
| commit | 6326b8c51ee9cd1eafaa23aea569299fd57242d6 (patch) | |
| tree | b70d186e62e4ae86f480bcd518fd1ed78cacc4ce | |
| parent | 3ec6b95a95c37ee008e0cfd841270712fff74e0d (diff) | |
| parent | ddd91dbb42f6f52655738c6520548d04ea5f8468 (diff) | |
Merge github.com:grpc/grpc into measure_some_things
| -rwxr-xr-x | tools/jenkins/run_portability.sh | 10 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/tools/jenkins/run_portability.sh b/tools/jenkins/run_portability.sh index 82aaa935c6..6f15da73f4 100755 --- a/tools/jenkins/run_portability.sh +++ b/tools/jenkins/run_portability.sh @@ -41,6 +41,14 @@ set -ex -o igncr || set -ex echo "building $scenario" +# If scenario has _bo suffix, add --build_only flag. +# Short suffix name had to been chosen due to path length limit on Windows. +if [ "$scenario" != "${scenario%_bo}" ] +then + scenario="${scenario%_bo}" + BUILD_ONLY_MAYBE="--build_only" +fi + parts=($(echo $scenario | tr '_' ' ')) # split scenario into parts curr_platform=${parts[0]} # variable named 'platform' breaks the windows build @@ -54,4 +62,4 @@ then USE_DOCKER_MAYBE="--use_docker" fi -python tools/run_tests/run_tests.py $USE_DOCKER_MAYBE -t -l $language -c $config --arch ${curr_arch} --compiler ${curr_compiler} -x report.xml -j 3 $@
\ No newline at end of file +python tools/run_tests/run_tests.py $USE_DOCKER_MAYBE $BUILD_ONLY_MAYBE -t -l $language -c $config --arch ${curr_arch} --compiler ${curr_compiler} -x report.xml -j 3 $@ diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index fa4a37af6b..fbc74014e9 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1059,13 +1059,15 @@ def _build_and_run( check_cancelled, newline_on_success, cache, xml_report=None, build_only=False): """Do one pass of building & running tests.""" # build latest sequentially - num_failures, _ = jobset.run( + num_failures, resultset = jobset.run( build_steps, maxjobs=1, stop_on_failure=True, newline_on_success=newline_on_success, travis=args.travis) if num_failures: return [BuildAndRunError.BUILD] if build_only: + if xml_report: + report_utils.render_junit_xml_report(resultset, xml_report) return [] # start antagonists |