From b71978d2377660c62c98ec2193f2a6d712fb3040 Mon Sep 17 00:00:00 2001 From: "Robert P. Goldman" <rpgoldman@sift.net> Date: Tue, 30 Jun 2015 22:35:23 -0500 Subject: [PATCH] Fix ACL on Windows to work in console. Use "build.exe" and "buildi.exe" to get this behavior. --- test/run-tests.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/test/run-tests.sh b/test/run-tests.sh index dbd8032e..5bc5c141 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -x # run-tests {lisp invocation} {scripts-regex} # - read lisp forms one at a time from standard input @@ -222,7 +222,17 @@ case "$lisp" in ALLEGRO=$command ; export ALLEGRO flags="-q" nodebug="-batch" -# if [ "$os" = windows ] && [ -z "$ALLEGRO_NOISY" ] ; then bcmd="$command +c $flags" ; fi + if [ "$os" = windows ] && [ -z "$ALLEGRO_NOISY" ] ; then + adir=$(dirname "${command}") ; + allegroName=$(basename "${command}") ; + if [[ ${allegroName: -1} == "8" ]] ; then build=build ; else build=buildi ; fi ; + # this takes somewhat unjustifiable advantage of the fact that + # the Allegro images have the same name (with .dxl extension) + # as the corresponding executables. the "build" executable + # runs an ACL image in the current terminal instead of a + # separate window, as is normal on Windows. + bcmd="${adir}/${build}.exe -I ${command}.dxl $flags" ; + fi eval="-e" ;; ccl) command="${CCL:-ccl}" -- GitLab