about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-12-08 06:44:43 +0100
committerGitHub <noreply@github.com>2023-12-08 06:44:43 +0100
commitbeabb5e2e30759a6613d0fb7eed5c79e70f71476 (patch)
tree2f963815f910cd5522cb19eb855858ccd6492eed /tests
parentf7c892e3234829ff0f6e5b52ad1daf0c0be412a4 (diff)
parentdabedb711f13e14401e6be2f9a58a9bc1974a488 (diff)
downloadrust-beabb5e2e30759a6613d0fb7eed5c79e70f71476.tar.gz
rust-beabb5e2e30759a6613d0fb7eed5c79e70f71476.zip
Rollup merge of #118709 - oksbsb:fix-job-server, r=SparrowLii
fix jobserver GLOBAL_CLIENT_CHECKED uninitialized before use

override #118589, resolve merge conflict

`@petrochenkov` `@SparrowLii`

Thanks!
Diffstat (limited to 'tests')
-rw-r--r--tests/run-make/jobserver-error/cannot_open_fd.stderr2
-rw-r--r--tests/run-make/jobserver-error/not_a_pipe.stderr2
2 files changed, 0 insertions, 4 deletions
diff --git a/tests/run-make/jobserver-error/cannot_open_fd.stderr b/tests/run-make/jobserver-error/cannot_open_fd.stderr
index a2f77a94e4f..343de5cd52c 100644
--- a/tests/run-make/jobserver-error/cannot_open_fd.stderr
+++ b/tests/run-make/jobserver-error/cannot_open_fd.stderr
@@ -4,5 +4,3 @@ warning: failed to connect to jobserver from environment variable `MAKEFLAGS="--
 
 error: no input filename given
 
-warning: 1 warning emitted
-
diff --git a/tests/run-make/jobserver-error/not_a_pipe.stderr b/tests/run-make/jobserver-error/not_a_pipe.stderr
index 9158fda6e47..536c04576b9 100644
--- a/tests/run-make/jobserver-error/not_a_pipe.stderr
+++ b/tests/run-make/jobserver-error/not_a_pipe.stderr
@@ -2,5 +2,3 @@ warning: failed to connect to jobserver from environment variable `MAKEFLAGS="--
   |
   = note: the build environment is likely misconfigured
 
-warning: 1 warning emitted
-