about summary refs log tree commit diff
diff options
context:
space:
mode:
authorZalathar <Zalathar@users.noreply.github.com>2024-06-09 13:02:05 +1000
committerZalathar <Zalathar@users.noreply.github.com>2024-06-09 14:37:22 +1000
commit0f8c3adc687a727fe1cbb4f3e83d68cec95b2ace (patch)
tree711bf6ef2b50682a88e78a255020a754b9a6a5ec
parent92a56ff2919df7ad58d410be1629903b65283db9 (diff)
downloadrust-0f8c3adc687a727fe1cbb4f3e83d68cec95b2ace.tar.gz
rust-0f8c3adc687a727fe1cbb4f3e83d68cec95b2ace.zip
Make job `x86_64-gnu-debug` run a subset of run-make tests
It looks like this job was intending to run all of the `needs-matching-clang`
tests (since they don't run without `RUSTBUILD_FORCE_CLANG_BASED_TESTS`), but
over time developed two problems:

- The tests it cares about were moved from run-make-fulldeps to run-make.
- Some of the relevant tests don't actually have "clang" in their name.

Switching to run-make solves the first problem, but we still don't run the
tests without "clang" in their name, because some of them are currently broken.
-rw-r--r--src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile
index e4534d0f840..64a1fb093b4 100644
--- a/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile
@@ -44,6 +44,14 @@ ENV RUST_CONFIGURE_ARGS \
       --set target.x86_64-unknown-linux-gnu.cc=clang \
       --set target.x86_64-unknown-linux-gnu.cxx=clang++
 
+# This job appears to be checking two separate things:
+# - That we can build the compiler with `--enable-debug`
+#   (without necessarily testing the result).
+# - That the tests with `//@ needs-matching-clang` pass, since they
+#   don't run by default unless RUSTBUILD_FORCE_CLANG_BASED_TESTS is set.
+#   - FIXME(https://github.com/rust-lang/rust/pull/126155#issuecomment-2156314273):
+#     Currently we only run the subset of tests with "clang" in their name.
+
 ENV SCRIPT \
   python3 ../x.py --stage 2 build && \
-  python3 ../x.py --stage 2 test tests/run-make-fulldeps --test-args clang
+  python3 ../x.py --stage 2 test tests/run-make --test-args clang