Adjust windows-gnullvm setup

Author: taiki-e

docker/test/entrypoint.sh

@@ -599,7 +599,6 @@ EOF
                     sed -i "s/qemu-${qemu_arch}-static/qemu-${qemu_arch}/g" "${wine_root}/bin/${bin}"
                 done
                 cp "${wine_root}"/lib/ld-linux-aarch64.so.1 /lib/
-                wineprefix="export WINEPREFIX=\${WINEPREFIX:-${wine_root}/wine-prefix}"
                 [[ -f "${toolchain_dir}/bin/qemu-${qemu_arch}" ]] || cp "$(type -P "qemu-${qemu_arch}")" "${toolchain_dir}/bin"
                 "qemu-${qemu_arch}" --version
                 ;;
@@ -610,7 +609,6 @@ EOF
 set -eu
 toolchain_dir="\$(cd "\$(dirname "\$0")"/.. && pwd)"
 export WINEPATH="${winepath};\${WINEPATH:-}"
-${wineprefix:-}
 exec ${wine_exe} "\$@"
 EOF
         chmod +x "${toolchain_dir}/bin/${runner}"

docker/test/test.sh

@@ -307,29 +307,18 @@ if [[ -z "${no_std}" ]]; then
             amd64)
                 case "${RUST_TARGET}" in
                     *-windows-gnu*)
+                        export HOME=/tmp/home
+                        mkdir -p "${HOME}"/.wine
+                        export WINEPREFIX=/tmp/wine
+                        mkdir -p "${WINEPREFIX}"
                         case "${RUST_TARGET}" in
-                            aarch64*)
-                                wine_root=/opt/wine-arm64
-                                export HOME=/tmp/home
-                                mkdir -p "${HOME}/.wine"
-                                if [[ ! -e /WINEBOOT ]]; then
-                                    x "${wine_root}/bin/wineserver" &>/dev/null
-                                    touch /WINEBOOT
-                                fi
-                                ;;
-                            *)
-                                # Adapted from https://github.com/cross-rs/cross/blob/16a64e7028d90a3fdf285cfd642cdde9443c0645/docker/windows-entry.sh
-                                export HOME=/tmp/home
-                                mkdir -p "${HOME}"
-                                # Initialize the wine prefix (virtual windows installation)
-                                export WINEPREFIX=/tmp/wine
-                                mkdir -p "${WINEPREFIX}"
-                                if [[ ! -e /WINEBOOT ]]; then
-                                    x wineboot &>/dev/null
-                                    touch /WINEBOOT
-                                fi
-                                ;;
+                            aarch64*) wineboot=/opt/wine-arm64/bin/wineserver ;;
+                            *) wineboot=wineboot ;;
                         esac
+                        if [[ ! -e /WINEBOOT ]]; then
+                            x "${wineboot}" &>/dev/null
+                            touch /WINEBOOT
+                        fi
                         ;;
                 esac
                 ;;

docker/windows-gnullvm.Dockerfile

@@ -80,7 +80,7 @@ COPY --from=ghcr.io/taiki-e/qemu-user /usr/bin/qemu-aarch64 /usr/bin/
 COPY --from=linaro/wine-arm64 /opt/wine-arm64 /opt/wine-arm64
 RUN <<EOF
 case "${RUST_TARGET}" in
-    aarch64*) ;;
+    aarch64*) rm -rf /opt/wine-arm64/wine-prefix ;;
     *)
         rm -rf /opt/wine-arm64
         mkdir -p /opt/wine-arm64