diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2017-09-18 16:28:03 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-09-18 16:28:03 +0200 |
| commit | a5f46e29bcee3068f5ec6691b7e06cf944430881 (patch) | |
| tree | 3dc4978b3f5bad6482a2b67dc0925e8a3ca11b2e /tools/internal_ci | |
| parent | c8cbddae0be904713bcf39d1363b27134adbfc3b (diff) | |
| parent | 05eadf21e05d521d73a05babf7c8f45218728355 (diff) | |
Merge pull request #12477 from jtattermusch/reveal_hangs
Reveal processes left by our test suite.
Diffstat (limited to 'tools/internal_ci')
| -rwxr-xr-x | tools/internal_ci/linux/grpc_run_tests_matrix.sh | 12 | ||||
| -rwxr-xr-x | tools/internal_ci/macos/grpc_run_tests_matrix.sh | 5 | ||||
| -rw-r--r-- | tools/internal_ci/windows/grpc_run_tests_matrix.bat | 10 |
3 files changed, 22 insertions, 5 deletions
diff --git a/tools/internal_ci/linux/grpc_run_tests_matrix.sh b/tools/internal_ci/linux/grpc_run_tests_matrix.sh index 028704b3ff..bd1430b741 100755 --- a/tools/internal_ci/linux/grpc_run_tests_matrix.sh +++ b/tools/internal_ci/linux/grpc_run_tests_matrix.sh @@ -20,4 +20,14 @@ cd $(dirname $0)/../../.. source tools/internal_ci/helper_scripts/prepare_build_linux_rc -tools/run_tests/run_tests_matrix.py $RUN_TESTS_FLAGS +tools/run_tests/run_tests_matrix.py $RUN_TESTS_FLAGS || FAILED="true" + +# Reveal leftover processes that might be left behind by the build +ps aux | grep -i kbuilder + +echo 'Exiting gRPC main test script.' + +if [ "$FAILED" != "" ] +then + exit 1 +fi diff --git a/tools/internal_ci/macos/grpc_run_tests_matrix.sh b/tools/internal_ci/macos/grpc_run_tests_matrix.sh index 9a43e4869b..8e7fd54a62 100755 --- a/tools/internal_ci/macos/grpc_run_tests_matrix.sh +++ b/tools/internal_ci/macos/grpc_run_tests_matrix.sh @@ -25,6 +25,11 @@ tools/run_tests/run_tests_matrix.py $RUN_TESTS_FLAGS || FAILED="true" # kill port_server.py to prevent the build from hanging ps aux | grep port_server\\.py | awk '{print $2}' | xargs kill -9 +# Reveal leftover processes that might be left behind by the build +ps aux | grep -i kbuilder + +echo 'Exiting gRPC main test script.' + if [ "$FAILED" != "" ] then exit 1 diff --git a/tools/internal_ci/windows/grpc_run_tests_matrix.bat b/tools/internal_ci/windows/grpc_run_tests_matrix.bat index 08d834f8b0..10627add25 100644 --- a/tools/internal_ci/windows/grpc_run_tests_matrix.bat +++ b/tools/internal_ci/windows/grpc_run_tests_matrix.bat @@ -17,8 +17,10 @@ cd /d %~dp0\..\..\.. call tools/internal_ci/helper_scripts/prepare_build_windows.bat -python tools/run_tests/run_tests_matrix.py %RUN_TESTS_FLAGS% || goto :error -goto :EOF +python tools/run_tests/run_tests_matrix.py %RUN_TESTS_FLAGS% +set RUNTESTS_EXITCODE=%errorlevel% -:error -exit /b %errorlevel% +@rem Reveal leftover processes that might be left behind by the build +tasklist /V + +exit /b %RUNTESTS_EXITCODE% |