From 0ffc5167bbf259eced5230eb1ff343c42d349a00 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@college-de-france.fr>
Date: Tue, 20 Aug 2024 10:33:35 +0200
Subject: [PATCH] GHA CI: use qemu-user from backports

This solves the PPC testing issue.
The ARM testing issue is solved by the updated test suite.
---
 tools/runner.sh | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/tools/runner.sh b/tools/runner.sh
index a6dae0e3c..50860dfde 100755
--- a/tools/runner.sh
+++ b/tools/runner.sh
@@ -33,25 +33,30 @@ if test -n "$opamroot"; then
   eval `opam env --safe`
 fi
 
+# Install QEMU and other packages using apt-get
+
+Apt_install() {
+  sudo sh -c 'echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list'
+  sudo apt-get update
+  sudo apt-get -y -t bookworm-backports install qemu-user
+  sudo apt-get -y install "$@"
+}
+
 # Install additional system packages
 
 System_install() {
   case "$target,$os" in
     aarch64,linux)
-      sudo apt-get update
-      sudo apt-get -y install qemu-user gcc-aarch64-linux-gnu
+      Apt_install gcc-aarch64-linux-gnu
       ;;
     arm,linux)
-      sudo apt-get update
-      sudo apt-get -y install qemu-user gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf
+      Apt_install gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf
       ;;
     ppc,linux)
-      sudo apt-get update
-      sudo apt-get -y install qemu-user gcc-powerpc-linux-gnu
+      Apt_install gcc-powerpc-linux-gnu
       ;;
     riscv,linux)
-      sudo apt-get update
-      sudo apt-get -y install qemu-user gcc-riscv64-linux-gnu
+      Apt_install gcc-riscv64-linux-gnu
       ;;
     x86_32,linux)
       sudo apt-get update
@@ -184,21 +189,17 @@ case "$target,$os" in
       2) Run_test "" "-Os";;
     esac;;
   arm,linux)
-    # TEMPORARY: skip ARM testing because of QEMU problem on the test VM
-    # case "$1" in
-    #   1) Run_test "$simu_armhf" "-marm";;
-    #   2) Run_test "$simu_armhf" "-mthumb";;
-    #   3) Rebuild_runtime -toolprefix arm-linux-gnueabi- arm-eabi
-    #      Run_test "$simu_armsf" "-marm";;
-    # esac;;
-    echo "Skipping ARM tests";;
+    case "$1" in
+      1) Run_test "$simu_armhf" "-marm";;
+      2) Run_test "$simu_armhf" "-mthumb";;
+      3) Rebuild_runtime -toolprefix arm-linux-gnueabi- arm-eabi
+         Run_test "$simu_armsf" "-marm";;
+    esac;;
   ppc,linux)
-    # TEMPORARY: skip PPC testing because of QEMU problem on the test VM
-    # case "$1" in
-    #   1) Run_test "$simu_ppc32" "";;
-    #   2) Run_test "$simu_ppc32" "-Os";;
-    # esac;;
-    echo "Skipping PPC tests";;
+    case "$1" in
+      1) Run_test "$simu_ppc32" "";;
+      2) Run_test "$simu_ppc32" "-Os";;
+    esac;;
   riscv,linux)
     case "$1" in
       1) Run_test "$simu_rv64" "";;