Merge pull request #4133 from folkertdev/faster-sparc64-ci

use `qemu-sparc64` to run sparc64 tests
rust-lang · Nov 22, 2024 · 294a882 · 294a882
2 parents 24827f4 + e580f56
commit 294a882
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/ci/docker/sparc64-unknown-linux-gnu/Dockerfile b/ci/docker/sparc64-unknown-linux-gnu/Dockerfile
@@ -12,14 +12,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev \
         gcc-sparc64-linux-gnu libc6-dev-sparc64-cross \
         qemu-system-sparc64 openbios-sparc seabios ipxe-qemu \
-        p7zip-full cpio linux-libc-dev-sparc64-cross
+        p7zip-full cpio linux-libc-dev-sparc64-cross qemu-user
 
 COPY linux-sparc64.sh /
 RUN /linux-sparc64.sh
 
-COPY test-runner-linux /
-
 ENV CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_LINKER=sparc64-linux-gnu-gcc \
-    CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_RUNNER="/test-runner-linux sparc64" \
+    CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_RUNNER="qemu-sparc64 -L /usr/sparc64-linux-gnu" \
     CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
     PATH=$PATH:/rust/bin