Skip to content

Commit 294a882

Browse files
authored
Merge pull request #4133 from folkertdev/faster-sparc64-ci
use `qemu-sparc64` to run sparc64 tests
2 parents 24827f4 + e580f56 commit 294a882

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

ci/docker/sparc64-unknown-linux-gnu/Dockerfile

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1212
gcc libc6-dev \
1313
gcc-sparc64-linux-gnu libc6-dev-sparc64-cross \
1414
qemu-system-sparc64 openbios-sparc seabios ipxe-qemu \
15-
p7zip-full cpio linux-libc-dev-sparc64-cross
15+
p7zip-full cpio linux-libc-dev-sparc64-cross qemu-user
1616

1717
COPY linux-sparc64.sh /
1818
RUN /linux-sparc64.sh
1919

20-
COPY test-runner-linux /
21-
2220
ENV CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_LINKER=sparc64-linux-gnu-gcc \
23-
CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_RUNNER="/test-runner-linux sparc64" \
21+
CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_RUNNER="qemu-sparc64 -L /usr/sparc64-linux-gnu" \
2422
CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
2523
PATH=$PATH:/rust/bin

0 commit comments

Comments
 (0)