Skip to content

Commit c0f62b4

Browse files
committed
Re-enable the disabled PPC tests, Upgrade CPU
1 parent 8bcad03 commit c0f62b4

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ FROM ubuntu:24.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \
55
gcc-powerpc64-linux-gnu libc6-dev-ppc64-cross \
6-
qemu-system-ppc file make
6+
file make
77

88
ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc \
9-
CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc64 -cpu power9 -L /usr/powerpc64-linux-gnu" \
9+
CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc64 -cpu power10 -L /usr/powerpc64-linux-gnu" \
1010
CC=powerpc64-linux-gnu-gcc \
1111
OBJDUMP=powerpc64-linux-gnu-objdump

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ FROM ubuntu:24.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \
55
gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross \
6-
qemu-system-ppc file make
6+
file make
77

88
# Work around qemu triggering a sigill on vec_subs if the cpu target is not defined.
99
ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc \
10-
CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc64le -cpu power9 -L /usr/powerpc64le-linux-gnu" \
10+
CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc64le -cpu power10 -L /usr/powerpc64le-linux-gnu" \
1111
CC=powerpc64le-linux-gnu-gcc \
1212
OBJDUMP=powerpc64le-linux-gnu-objdump

ci/run.sh

-4
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ cargo_test() {
8282
wasm32*)
8383
cmd="$cmd --nocapture"
8484
;;
85-
# qemu has an erratic behavior on those tests
86-
powerpc64*)
87-
cmd="$cmd --skip test_vec_lde_u16 --skip test_vec_lde_u32 --skip test_vec_expte"
88-
;;
8985
esac
9086

9187
if [ "$SKIP_TESTS" != "" ]; then

0 commit comments

Comments
 (0)