@@ -33,25 +33,30 @@ if test -n "$opamroot"; then
33
33
eval ` opam env --safe`
34
34
fi
35
35
36
+ # Install QEMU and other packages using apt-get
37
+
38
+ Apt_install () {
39
+ sudo sh -c ' echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list'
40
+ sudo apt-get update
41
+ sudo apt-get -y -t bookworm-backports install qemu-user
42
+ sudo apt-get -y install " $@ "
43
+ }
44
+
36
45
# Install additional system packages
37
46
38
47
System_install () {
39
48
case " $target ,$os " in
40
49
aarch64,linux)
41
- sudo apt-get update
42
- sudo apt-get -y install qemu-user gcc-aarch64-linux-gnu
50
+ Apt_install gcc-aarch64-linux-gnu
43
51
;;
44
52
arm,linux)
45
- sudo apt-get update
46
- sudo apt-get -y install qemu-user gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf
53
+ Apt_install gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf
47
54
;;
48
55
ppc,linux)
49
- sudo apt-get update
50
- sudo apt-get -y install qemu-user gcc-powerpc-linux-gnu
56
+ Apt_install gcc-powerpc-linux-gnu
51
57
;;
52
58
riscv,linux)
53
- sudo apt-get update
54
- sudo apt-get -y install qemu-user gcc-riscv64-linux-gnu
59
+ Apt_install gcc-riscv64-linux-gnu
55
60
;;
56
61
x86_32,linux)
57
62
sudo apt-get update
@@ -184,21 +189,17 @@ case "$target,$os" in
184
189
2) Run_test " " " -Os" ;;
185
190
esac ;;
186
191
arm,linux)
187
- # TEMPORARY: skip ARM testing because of QEMU problem on the test VM
188
- # case "$1" in
189
- # 1) Run_test "$simu_armhf" "-marm";;
190
- # 2) Run_test "$simu_armhf" "-mthumb";;
191
- # 3) Rebuild_runtime -toolprefix arm-linux-gnueabi- arm-eabi
192
- # Run_test "$simu_armsf" "-marm";;
193
- # esac;;
194
- echo " Skipping ARM tests" ;;
192
+ case " $1 " in
193
+ 1) Run_test " $simu_armhf " " -marm" ;;
194
+ 2) Run_test " $simu_armhf " " -mthumb" ;;
195
+ 3) Rebuild_runtime -toolprefix arm-linux-gnueabi- arm-eabi
196
+ Run_test " $simu_armsf " " -marm" ;;
197
+ esac ;;
195
198
ppc,linux)
196
- # TEMPORARY: skip PPC testing because of QEMU problem on the test VM
197
- # case "$1" in
198
- # 1) Run_test "$simu_ppc32" "";;
199
- # 2) Run_test "$simu_ppc32" "-Os";;
200
- # esac;;
201
- echo " Skipping PPC tests" ;;
199
+ case " $1 " in
200
+ 1) Run_test " $simu_ppc32 " " " ;;
201
+ 2) Run_test " $simu_ppc32 " " -Os" ;;
202
+ esac ;;
202
203
riscv,linux)
203
204
case " $1 " in
204
205
1) Run_test " $simu_rv64 " " " ;;
0 commit comments