aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/shell
diff options
context:
space:
mode:
authorGravatar philwo <philwo@google.com>2017-05-15 19:10:21 +0200
committerGravatar Dmitry Lomov <dslomov@google.com>2017-05-15 19:51:30 +0200
commitc4f271d1a68366b6fa5ff38ea7d951b6a22af044 (patch)
treed25907cb63fa336798ba7ae22771fb74b659f2d8 /src/test/shell
parent48034fdb65b3c8e9f2860ff3038d4189945f02e0 (diff)
Automated g4 rollback of commit 3e5edafa2a04a71cd3596e929e83222da725f3f9.
*** Reason for rollback *** Likely cause for b/38172480 ("blaze now waits for all processes spawned by local tests to terminate") and b/38194553 ("Server terminated abruptly (error code: 14, error message: 'Endpoint read failed'"). I have a fix almost ready, but it consists of many lines of new code - we shouldn't rush that into Bazel's 0.5.0 release. Instead, let's roll this back, do a release using the known good older process-wrapper and then go forward in 0.5.1 with a better and well tested new version of this. *** Original change description *** process-wrapper: Wait for all (grand)children before exiting. This uses Linux's PR_SET_CHILD_SUBREAPER and FreeBSD's PROC_REAP_ACQUIRE features to become an init-like process for all (grand)children spawned by process-wrapper, which allows us to a) kill them reliably and then b) wait for them reliably. Before this change, we only killed the main child, waited for it, then fired off a kill -9 on the process group, without waiting for it. This led to a race condition where Bazel would try to use... *** PiperOrigin-RevId: 156068188
Diffstat (limited to 'src/test/shell')
-rwxr-xr-xsrc/test/shell/bazel/process-wrapper_test.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/shell/bazel/process-wrapper_test.sh b/src/test/shell/bazel/process-wrapper_test.sh
index 18903d3bfc..b720ab8dbd 100755
--- a/src/test/shell/bazel/process-wrapper_test.sh
+++ b/src/test/shell/bazel/process-wrapper_test.sh
@@ -105,7 +105,7 @@ function test_execvp_error_message() {
local code=0
$process_wrapper -1 0 $OUT $ERR /bin/notexisting &> $TEST_log || code=$?
assert_equals 1 "$code"
- assert_contains "\"execvp(/bin/notexisting, [[:alnum:]]\+)\": No such file or directory" "$ERR"
+ assert_contains "execvp(\"/bin/notexisting\", ...): No such file or directory" "$ERR"
}
run_suite "process-wrapper"