From 814c19634d183e698decb98e6cbf2a6ec31a5693 Mon Sep 17 00:00:00 2001 From: Josh Stone <jistone@redhat.com> Date: Thu, 11 Apr 2024 14:29:37 -0700 Subject: [PATCH 1/2] ci: test cargo on `aarch64-gnu` --- src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile b/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile index 85b0f3b10818e..8f31c6cb712de 100644 --- a/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile +++ b/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile @@ -26,4 +26,6 @@ ENV RUST_CONFIGURE_ARGS \ --enable-sanitizers \ --enable-profiler \ --enable-compiler-docs -ENV SCRIPT python3 ../x.py --stage 2 test +# FIXME: Skipping cargo panic_abort_doc_tests due to https://github.com/rust-lang/rust/issues/123733 +ENV SCRIPT python3 ../x.py --stage 2 test && \ + python3 ../x.py --stage 2 test src/tools/cargo --test-args "--skip panic_abort_doc_tests" From 2970ae5a6b873ec035694147b102c72126b646f4 Mon Sep 17 00:00:00 2001 From: Josh Stone <cuviper@gmail.com> Date: Sun, 14 Apr 2024 10:42:59 -0700 Subject: [PATCH 2/2] Fix ENV quotes in aarch64-gnu/Dockerfile Co-authored-by: Eric Huss <eric@huss.org> --- src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile b/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile index 8f31c6cb712de..d5027589e0bd6 100644 --- a/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile +++ b/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile @@ -28,4 +28,4 @@ ENV RUST_CONFIGURE_ARGS \ --enable-compiler-docs # FIXME: Skipping cargo panic_abort_doc_tests due to https://github.com/rust-lang/rust/issues/123733 ENV SCRIPT python3 ../x.py --stage 2 test && \ - python3 ../x.py --stage 2 test src/tools/cargo --test-args "--skip panic_abort_doc_tests" + python3 ../x.py --stage 2 test src/tools/cargo --test-args \"--skip panic_abort_doc_tests\"